diff options
author | Jeremy Walker <jewalker@google.com> | 2017-11-09 14:12:19 -0800 |
---|---|---|
committer | Jeremy Walker <jewalker@google.com> | 2017-11-16 14:40:58 -0800 |
commit | 866865b6ddfb9cbff31d23fceb0563765b1365be (patch) | |
tree | 7d84c607042c028ace10d9c3c067c605cd4d9519 /wearable | |
parent | 947d04d9e8c928b29b593f867312d7a7a8de9abe (diff) | |
download | android-866865b6ddfb9cbff31d23fceb0563765b1365be.tar.gz |
Fixes style violations (no logic changes).
Comment and other minor fixes coming in next CLs (along with some
refactors).
Bug: 65458565
Test: Manually tested with Wear device.
Change-Id: I7f460555d635f8539a1a2e355afe74fa816da21c
Diffstat (limited to 'wearable')
32 files changed, 549 insertions, 507 deletions
diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AccessibilityActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AccessibilityActivity.java index 6874e2c8..a7e1fb62 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AccessibilityActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AccessibilityActivity.java @@ -36,11 +36,14 @@ public class AccessibilityActivity extends WearableActivity { TextView accessibilityText = findViewById(R.id.icon_text_view); accessibilityText.setText(R.string.accessibility_settings); - findViewById(R.id.accessibility_button_include).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - startActivityForResult(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), 0); - } - }); + findViewById(R.id.accessibility_button_include) + .setOnClickListener( + new OnClickListener() { + @Override + public void onClick(View v) { + startActivityForResult( + new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), 0); + } + }); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItem.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItem.java index bc082468..9ec2ac49 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItem.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItem.java @@ -25,8 +25,8 @@ public class AppItem { private final int mViewType; private final Class mClass; - public AppItem(String itemName, int imageId, int viewType, Class<? - extends WearableActivity> clazz) { + public AppItem( + String itemName, int imageId, int viewType, Class<? extends WearableActivity> clazz) { mItemName = itemName; mImageId = imageId; mViewType = viewType; @@ -55,4 +55,4 @@ public class AppItem { public void launchActivity(Context context) { context.startActivity(new Intent(context, mClass)); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItemListViewAdapter.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItemListViewAdapter.java index 368a7352..372f995b 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItemListViewAdapter.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/AppItemListViewAdapter.java @@ -61,4 +61,4 @@ public class AppItemListViewAdapter extends ArrayAdapter<AppItem> { TextView mTextView; ImageView mImageView; } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/CircledImageViewPreference.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/CircledImageViewPreference.java index 4617a745..d78b7037 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/CircledImageViewPreference.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/CircledImageViewPreference.java @@ -83,18 +83,19 @@ public class CircledImageViewPreference extends Preference { mCircledImageText.setText(R.string.loading); mCircledImage.setImageResource(R.drawable.stop); mCircledImage.setCircleBorderColor(mColorAccent); - mCountDownTimer = new CountDownTimer(10000, 10) { - @Override - public void onTick(long millisUntilFinished) { - float timeElapsed = (10000.0f - millisUntilFinished) / 10000.0f; - mCircledImage.setProgress(timeElapsed); - } + mCountDownTimer = + new CountDownTimer(10000, 10) { + @Override + public void onTick(long millisUntilFinished) { + float timeElapsed = (10000.0f - millisUntilFinished) / 10000.0f; + mCircledImage.setProgress(timeElapsed); + } - @Override - public void onFinish() { - setStartCircledImageView(); - } - }.start(); + @Override + public void onFinish() { + setStartCircledImageView(); + } + }.start(); } public void cancelCountDownTimer() { @@ -102,4 +103,4 @@ public class CircledImageViewPreference extends Preference { mCountDownTimer.cancel(); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ControlsActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ControlsActivity.java index 7dfdf3e0..c056f16e 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ControlsActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ControlsActivity.java @@ -25,7 +25,8 @@ public class ControlsActivity extends WearableActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Display the fragment as the main content. - getFragmentManager().beginTransaction() + getFragmentManager() + .beginTransaction() .replace(android.R.id.content, new ControlsPrefFragment()) .commit(); } @@ -39,4 +40,4 @@ public class ControlsActivity extends WearableActivity { addPreferencesFromResource(R.xml.prefs_controls); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsActivity.java index f3828a73..0c394008 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsActivity.java @@ -44,83 +44,101 @@ public class DialogsActivity extends WearableActivity { setContentView(R.layout.activity_dialogs); // Supplier objects - Supplier<Dialog> twoActionDialog = new Supplier<Dialog>() { - @Override - public Dialog get() { - AcceptDenyDialog twoActionDialog = new AcceptDenyDialog(DialogsActivity.this); - twoActionDialog.setTitle(R.string.yes_no_dialog); - twoActionDialog.setMessage(getString(R.string.yes_no_dialog_description)); - twoActionDialog.setPositiveButton(new OnClickListener() { + Supplier<Dialog> twoActionDialog = + new Supplier<Dialog>() { @Override - public void onClick(DialogInterface dialog, int which) { - // Add code here for onClick functionality. + public Dialog get() { + AcceptDenyDialog twoActionDialog = + new AcceptDenyDialog(DialogsActivity.this); + twoActionDialog.setTitle(R.string.yes_no_dialog); + twoActionDialog.setMessage(getString(R.string.yes_no_dialog_description)); + twoActionDialog.setPositiveButton( + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Add code here for onClick functionality. + } + }); + twoActionDialog.setNegativeButton( + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Add code here for onClick functionality. + } + }); + return twoActionDialog; } - }); - twoActionDialog.setNegativeButton(new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Add code here for onClick functionality. - } - }); - return twoActionDialog; - } - }; - - Supplier<Dialog> oneActionDialog = new Supplier<Dialog>() { - @Override - public Dialog get() { - AcceptDenyDialog oneActionDialog = new AcceptDenyDialog(DialogsActivity.this); - oneActionDialog.setTitle(R.string.one_action_dialog); - oneActionDialog.setMessage(getString(R.string.one_action_dialog_description)); - oneActionDialog.setPositiveButton(new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Add code here for onClick functionality. - } - }); - return oneActionDialog; - } - }; - - Supplier<Dialog> multipleActionDialog = new Supplier<Dialog>() { - @Override - public Dialog get() { - DialogBuilder multipleActionBuilder = new DialogBuilder(DialogsActivity.this); - multipleActionBuilder.setTitle(R.string.multiple_action_dialog); - multipleActionBuilder.setMessage(R.string.multiple_action_dialog_description); - - // OK option. - multipleActionBuilder.setPositiveIcon(R.drawable.accept_circle); - multipleActionBuilder.setPositiveButton(R.string.ok, new OnClickListener() { + }; + + Supplier<Dialog> oneActionDialog = + new Supplier<Dialog>() { @Override - public void onClick(DialogInterface dialog, int which) { - // Add code here for onClick functionality. + public Dialog get() { + AcceptDenyDialog oneActionDialog = + new AcceptDenyDialog(DialogsActivity.this); + oneActionDialog.setTitle(R.string.one_action_dialog); + oneActionDialog.setMessage( + getString(R.string.one_action_dialog_description)); + oneActionDialog.setPositiveButton( + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Add code here for onClick functionality. + } + }); + return oneActionDialog; } - }); + }; - // Close option. - multipleActionBuilder.setNeutralIcon(R.drawable.deny_circle); - multipleActionBuilder.setNeutralButton(R.string.close, new OnClickListener() { + Supplier<Dialog> multipleActionDialog = + new Supplier<Dialog>() { @Override - public void onClick(DialogInterface dialog, int which) { - // Add code here for onClick functionality. + public Dialog get() { + DialogBuilder multipleActionBuilder = + new DialogBuilder(DialogsActivity.this); + multipleActionBuilder.setTitle(R.string.multiple_action_dialog); + multipleActionBuilder.setMessage( + R.string.multiple_action_dialog_description); + + // OK option. + multipleActionBuilder.setPositiveIcon(R.drawable.accept_circle); + multipleActionBuilder.setPositiveButton( + R.string.ok, + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Add code here for onClick functionality. + } + }); + + // Close option. + multipleActionBuilder.setNeutralIcon(R.drawable.deny_circle); + multipleActionBuilder.setNeutralButton( + R.string.close, + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Add code here for onClick functionality. + } + }); + + // Open in phone option. + multipleActionBuilder.setNegativeIcon(R.drawable.open_in_phone_circle); + multipleActionBuilder.setNegativeButton( + R.string.open_on_phone, + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = + new Intent( + DialogsActivity.this, + OpenOnPhoneAnimationActivity.class); + startActivity(intent); + } + }); + return multipleActionBuilder.create(); } - }); - - // Open in phone option. - multipleActionBuilder.setNegativeIcon(R.drawable.open_in_phone_circle); - multipleActionBuilder - .setNegativeButton(R.string.open_on_phone, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Intent intent = new Intent(DialogsActivity.this, - OpenOnPhoneAnimationActivity.class); - startActivity(intent); - } - }); - return multipleActionBuilder.create(); - } - }; + }; // Create a list of items for adapter to display. mItems = new ArrayList<>(); @@ -146,14 +164,18 @@ public class DialogsActivity extends WearableActivity { // Dependent upon position of click. // Note: Keep in mind that icons will not appear on dialog unless you // set an onClickListener. - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - mView = view; - Dialog dialog = mItems.get(position - listView.getHeaderViewsCount()) - .getSupplier().get(); - dialog.show(); - } - }); + listView.setOnItemClickListener( + new AdapterView.OnItemClickListener() { + @Override + public void onItemClick( + AdapterView<?> parent, View view, int position, long id) { + mView = view; + Dialog dialog = + mItems.get(position - listView.getHeaderViewsCount()) + .getSupplier() + .get(); + dialog.show(); + } + }); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsItem.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsItem.java index 1fc00fea..25e83c33 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsItem.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/DialogsItem.java @@ -35,4 +35,4 @@ public class DialogsItem implements Item { public Supplier<Dialog> getSupplier() { return mSupplier; } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/FullScreenActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/FullScreenActivity.java index abdf5fc9..1ef6ed1e 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/FullScreenActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/FullScreenActivity.java @@ -25,5 +25,4 @@ public class FullScreenActivity extends WearableActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_fullscreen_progress); } - -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/GlobalNotificationBuilder.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/GlobalNotificationBuilder.java index 40b65bef..812ed944 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/GlobalNotificationBuilder.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/GlobalNotificationBuilder.java @@ -21,24 +21,24 @@ import android.support.v4.app.NotificationCompat; * We use a Singleton for a global copy of the NotificationCompat.Builder to update active * Notifications from other Services/Activities. * - * You have two options for updating your notifications: + * <p>You have two options for updating your notifications: * - * 1. Use a new NotificationCompatBuilder to create the Notification. This approach requires you - * to get *ALL* the information and pass it to the builder. We get all the information from a Mock - * Database and this is the approach used in the MainActivity. + * <p>1. Use a new NotificationCompatBuilder to create the Notification. This approach requires you + * to get *ALL* the information and pass it to the builder. We get all the information from a Mock + * Database and this is the approach used in the MainActivity. * - * 2. Use an existing NotificationCompatBuilder to create a Notification. This approach requires - * you to store a reference to the original builder. The benefit is you only need the new/updated - * information for an existing notification. We use this approach in the IntentService handlers to - * update existing notifications. + * <p>2. Use an existing NotificationCompatBuilder to create a Notification. This approach requires + * you to store a reference to the original builder. The benefit is you only need the new/updated + * information for an existing notification. We use this approach in the IntentService handlers to + * update existing notifications. * - * IMPORTANT NOTE 1: You shouldn't save/modify the resulting Notification object using - * its member variables and/or legacy APIs. If you want to retain anything from update - * to update, retain the Builder as option 2 outlines. + * <p>IMPORTANT NOTE 1: You shouldn't save/modify the resulting Notification object using its member + * variables and/or legacy APIs. If you want to retain anything from update to update, retain the + * Builder as option 2 outlines. * - * IMPORTANT NOTE 2: If the global Notification Builder is lost because the process is killed, you - * should have a way to recreate the Notification Builder from a persistent state. (We do this as - * well in the sample, check the IntentServices.) + * <p>IMPORTANT NOTE 2: If the global Notification Builder is lost because the process is killed, + * you should have a way to recreate the Notification Builder from a persistent state. (We do this + * as well in the sample, check the IntentServices.) */ public final class GlobalNotificationBuilder { @@ -48,13 +48,13 @@ public final class GlobalNotificationBuilder { * Empty constructor - We don't initialize builder because we rely on a null state to let us * know the Application's process was killed. */ - private GlobalNotificationBuilder() { } + private GlobalNotificationBuilder() {} - public static void setNotificationCompatBuilderInstance (NotificationCompat.Builder builder) { + public static void setNotificationCompatBuilderInstance(NotificationCompat.Builder builder) { sGlobalNotificationCompatBuilder = builder; } - public static NotificationCompat.Builder getNotificationCompatBuilderInstance(){ + public static NotificationCompat.Builder getNotificationCompatBuilderInstance() { return sGlobalNotificationCompatBuilder; } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ImagesActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ImagesActivity.java index cade8f90..5f1e8770 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ImagesActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ImagesActivity.java @@ -33,13 +33,14 @@ public class ImagesActivity extends WearableActivity { setContentView(R.layout.activity_images); // Used to repeat animation from the beginning. - mAnimationCallback = new AnimationCallback() { - @Override - public void onAnimationEnd(Drawable drawable) { - super.onAnimationEnd(drawable); - ((AnimatedVectorDrawable) drawable).start(); - } - }; + mAnimationCallback = + new AnimationCallback() { + @Override + public void onAnimationEnd(Drawable drawable) { + super.onAnimationEnd(drawable); + ((AnimatedVectorDrawable) drawable).start(); + } + }; // Play 'swipe left' animation on loop. ImageView mSwipeLeftImage = findViewById(R.id.swipe_left_image); @@ -60,4 +61,4 @@ public class ImagesActivity extends WearableActivity { mAnimatedVectorDrawableSwipe.unregisterAnimationCallback(mAnimationCallback); mAnimatedVectorDrawableTap.unregisterAnimationCallback(mAnimationCallback); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/InLineActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/InLineActivity.java index ee2f3b17..f5652f36 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/InLineActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/InLineActivity.java @@ -28,7 +28,8 @@ public class InLineActivity extends WearableActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getFragmentManager().beginTransaction() + getFragmentManager() + .beginTransaction() .replace(android.R.id.content, new InLinePrefFragment()) .commit(); } @@ -46,35 +47,38 @@ public class InLineActivity extends WearableActivity { // Load the preferences from an XML resource addPreferencesFromResource(R.xml.prefs_in_line_progress); - mDeterminantSwitchPref = (SwitchPreference) findPreference( - getString(R.string.key_pref_determinant_switch)); + mDeterminantSwitchPref = + (SwitchPreference) + findPreference(getString(R.string.key_pref_determinant_switch)); mDeterminantSwitchPref.setChecked(true); - mCircledImageViewPref = (CircledImageViewPreference) - findPreference(getString(R.string.key_pref_circled_image_view)); + mCircledImageViewPref = + (CircledImageViewPreference) + findPreference(getString(R.string.key_pref_circled_image_view)); - mPreferenceScreen = (PreferenceScreen) findPreference( - getString(R.string.key_pref_progress_screen)); + mPreferenceScreen = + (PreferenceScreen) findPreference(getString(R.string.key_pref_progress_screen)); mProgressBarPreference = new ProgressBarPreference(getContext()); mProgressBarPreference.setTitle("@string/indeterminant_progress"); - mDeterminantSwitchPref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - mDeterminantSwitchPref.setChecked(!mDeterminantSwitchPref.isChecked()); - if (mDeterminantSwitchPref.isChecked()) { - mCircledImageViewPref.cancelCountDownTimer(); - mCircledImageViewPref.setStartCircledImageView(); - mPreferenceScreen.removePreference(mProgressBarPreference); - mPreferenceScreen.addPreference(mCircledImageViewPref); - } else { - mPreferenceScreen.removePreference(mCircledImageViewPref); - mPreferenceScreen.addPreference(mProgressBarPreference); - } - return true; - } - }); + mDeterminantSwitchPref.setOnPreferenceChangeListener( + new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + mDeterminantSwitchPref.setChecked(!mDeterminantSwitchPref.isChecked()); + if (mDeterminantSwitchPref.isChecked()) { + mCircledImageViewPref.cancelCountDownTimer(); + mCircledImageViewPref.setStartCircledImageView(); + mPreferenceScreen.removePreference(mProgressBarPreference); + mPreferenceScreen.addPreference(mCircledImageViewPref); + } else { + mPreferenceScreen.removePreference(mCircledImageViewPref); + mPreferenceScreen.addPreference(mProgressBarPreference); + } + return true; + } + }); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/Item.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/Item.java index 98332686..182340e3 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/Item.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/Item.java @@ -17,4 +17,4 @@ package com.example.android.wearable.wear.wearaccessibilityapp; public interface Item { int getItemId(); -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListOfGraphicsActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListOfGraphicsActivity.java index 87c9ac9a..30ba972e 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListOfGraphicsActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListOfGraphicsActivity.java @@ -36,10 +36,18 @@ public class ListOfGraphicsActivity extends WearableActivity { // Store all data in a list for adapter to use. mItems = new ArrayList<AppItem>(); - mItems.add(new AppItem(getString(R.string.photo_carousel), R.drawable.heart_circle, - SampleAppConstants.NORMAL, PhotoCarouselActivity.class)); - mItems.add(new AppItem(getString(R.string.images), R.drawable.heart_circle, - SampleAppConstants.NORMAL, ImagesActivity.class)); + mItems.add( + new AppItem( + getString(R.string.photo_carousel), + R.drawable.heart_circle, + SampleAppConstants.NORMAL, + PhotoCarouselActivity.class)); + mItems.add( + new AppItem( + getString(R.string.images), + R.drawable.heart_circle, + SampleAppConstants.NORMAL, + ImagesActivity.class)); // Set up an adapter and pass in all the items you initialized above. AppItemListViewAdapter adapter = new AppItemListViewAdapter(this, mItems); @@ -55,12 +63,14 @@ public class ListOfGraphicsActivity extends WearableActivity { // Goes to a new screen when you click on one of the list items. // Dependent upon position of click. - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - mItems.get(position - listView.getHeaderViewsCount()) - .launchActivity(getApplicationContext()); - } - }); + listView.setOnItemClickListener( + new AdapterView.OnItemClickListener() { + @Override + public void onItemClick( + AdapterView<?> parent, View view, int position, long id) { + mItems.get(position - listView.getHeaderViewsCount()) + .launchActivity(getApplicationContext()); + } + }); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListViewAdapter.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListViewAdapter.java index 50671046..41b18d8a 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListViewAdapter.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListViewAdapter.java @@ -58,4 +58,4 @@ public class ListViewAdapter<T extends Item> extends ArrayAdapter<T> { TextView mTextView; ImageView mImageView; } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsActivity.java index fbcfd8ba..bc545db7 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsActivity.java @@ -55,12 +55,14 @@ public class ListsActivity extends WearableActivity { // Goes to a new screen when you click on one of the list items. // Dependent upon position of click. - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - mItems.get(position - listView.getHeaderViewsCount()) - .launchActivity(getApplicationContext()); - } - }); + listView.setOnItemClickListener( + new AdapterView.OnItemClickListener() { + @Override + public void onItemClick( + AdapterView<?> parent, View view, int position, long id) { + mItems.get(position - listView.getHeaderViewsCount()) + .launchActivity(getApplicationContext()); + } + }); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsItem.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsItem.java index c20c5054..6c2cece0 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsItem.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ListsItem.java @@ -35,4 +35,4 @@ public class ListsItem implements Item { public void launchActivity(Context context) { context.startActivity(new Intent(context, mClass)); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListActivity.java index 11183630..14ad7641 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListActivity.java @@ -49,24 +49,34 @@ public class LongListActivity extends WearableActivity { mItems.add(new AppItem(null, 0, SampleAppConstants.TITLE, null)); // for title mItems.add(new AppItem(null, 0, SampleAppConstants.SWITCH, null)); // for switch widget for (int i = 1; i <= 10; i++) { - mItems.add(new AppItem(getResources().getString(R.string.item_text, i), - R.drawable.heart_circle, SampleAppConstants.NORMAL, null)); + mItems.add( + new AppItem( + getResources().getString(R.string.item_text, i), + R.drawable.heart_circle, + SampleAppConstants.NORMAL, + null)); } // Custom adapter used so we can use custom layout for the rows within the list. - mAdapter = new LongListRecyclerViewAdapter(this, mItems, new SwitchChangeListener() { - @Override - public void onChange(boolean switchOn) { - WearableActionDrawer wearableActionDrawer = - findViewById(R.id.action_drawer_long_list); - - if(switchOn) { - wearableActionDrawer.setVisibility(View.VISIBLE); // Hide drawer. - } else { - wearableActionDrawer.setVisibility(View.INVISIBLE); // Hide drawer. - } - } - }); + mAdapter = + new LongListRecyclerViewAdapter( + this, + mItems, + new SwitchChangeListener() { + @Override + public void onChange(boolean switchOn) { + WearableActionDrawer wearableActionDrawer = + findViewById(R.id.action_drawer_long_list); + + if (switchOn) { + wearableActionDrawer.setVisibility( + View.VISIBLE); // Hide drawer. + } else { + wearableActionDrawer.setVisibility( + View.INVISIBLE); // Hide drawer. + } + } + }); WearableRecyclerView recyclerView = findViewById(R.id.recycler_view_long_list); recyclerView.setAdapter(mAdapter); // Set adapter to the recyclerView. @@ -76,7 +86,7 @@ public class LongListActivity extends WearableActivity { // (WearableActionDrawer) findViewById(R.id.action_drawer_long_list); // mWearableActionDrawer.setShouldPeekOnScrollDown(true); - mPreviousLastVisibleItem = 0; // default + mPreviousLastVisibleItem = 0; // default mLastVisibleItem = 0; mFinishLoad = false; @@ -84,51 +94,54 @@ public class LongListActivity extends WearableActivity { return; // invalid layout manager } - final LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView - .getLayoutManager(); - - recyclerView.addOnScrollListener(new WearableRecyclerView.OnScrollListener() { - @Override - public void onScrolled(RecyclerView recyclerView, int dx, int dy) { - super.onScrolled(recyclerView, dx, dy); - mLastVisibleItem = layoutManager.findLastVisibleItemPosition(); - if (!mFinishLoad) { - int count = layoutManager.getItemCount(); // total items in the recycler view - - // Do not notify LongListActivity if no NEW items have been displayed. - if (mLastVisibleItem <= mPreviousLastVisibleItem) { - return; - } - - // Do not notify LongListActivity if not yet scrolled to threshold. - if (mLastVisibleItem < count - 1) { - return; + final LinearLayoutManager layoutManager = + (LinearLayoutManager) recyclerView.getLayoutManager(); + + recyclerView.addOnScrollListener( + new WearableRecyclerView.OnScrollListener() { + @Override + public void onScrolled(RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + mLastVisibleItem = layoutManager.findLastVisibleItemPosition(); + if (!mFinishLoad) { + int count = + layoutManager + .getItemCount(); // total items in the recycler view + + // Do not notify LongListActivity if no NEW items have been displayed. + if (mLastVisibleItem <= mPreviousLastVisibleItem) { + return; + } + + // Do not notify LongListActivity if not yet scrolled to threshold. + if (mLastVisibleItem < count - 1) { + return; + } + + if (mLastVisibleItem % 10 == 2 && mLastVisibleItem != 2) { + return; + } + + // End of list, no more loading. + if (mLastVisibleItem >= SampleAppConstants.END_OF_LONG_LIST) { + mFinishLoad = true; // we are done loading more items. + addFooter(); + return; + } + + // Load more items + addData(); + + // To check if new items should be displayed or not. + mPreviousLastVisibleItem = mLastVisibleItem; + } } - - if (mLastVisibleItem % 10 == 2 && mLastVisibleItem != 2) { - return; - } - - // End of list, no more loading. - if (mLastVisibleItem >= SampleAppConstants.END_OF_LONG_LIST) { - mFinishLoad = true; // we are done loading more items. - addFooter(); - return; - } - - // Load more items - addData(); - - // To check if new items should be displayed or not. - mPreviousLastVisibleItem = mLastVisibleItem; - } - } - }); + }); } /** - * Add items to List<AppItem> items. - * More items requested by adapter (used to load list in batches of 10). + * Add items to List<AppItem> items. More items requested by adapter (used to load list in + * batches of 10). */ public void addData() { // Add progress bar to list. @@ -136,29 +149,32 @@ public class LongListActivity extends WearableActivity { mAdapter.notifyItemInserted(mItems.size() - 1); // Delay for 1000 milliseconds and then execute below code. - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - // Remove progress after the delay. - mItems.remove(mItems.size() - 1); - - // Add ten items to List<AppItem> items. - int listSize = mItems.size(); - for (int i = listSize - 1; i <= listSize + 8; i++) { - mItems.add(new AppItem(getResources().getString(R.string.item_text, i), - R.drawable.heart_circle, SampleAppConstants.NORMAL, null)); - } - mAdapter.notifyDataSetChanged(); - } - }, 1000); + mHandler.postDelayed( + new Runnable() { + @Override + public void run() { + // Remove progress after the delay. + mItems.remove(mItems.size() - 1); + + // Add ten items to List<AppItem> items. + int listSize = mItems.size(); + for (int i = listSize - 1; i <= listSize + 8; i++) { + mItems.add( + new AppItem( + getResources().getString(R.string.item_text, i), + R.drawable.heart_circle, + SampleAppConstants.NORMAL, + null)); + } + mAdapter.notifyDataSetChanged(); + } + }, + 1000); } - /** - * Add footer to List<AppItem> items. - * Requested by adapter (called at the end of the list). - */ + /** Add footer to List<AppItem> items. Requested by adapter (called at the end of the list). */ public void addFooter() { mItems.add(new AppItem(null, 0, SampleAppConstants.HEADER_FOOTER, null)); // add footer mAdapter.notifyItemInserted(mItems.size() - 1); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListRecyclerViewAdapter.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListRecyclerViewAdapter.java index 07226b91..96b273a5 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListRecyclerViewAdapter.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/LongListRecyclerViewAdapter.java @@ -28,8 +28,8 @@ import android.widget.TextView; import java.util.List; -public class LongListRecyclerViewAdapter extends - RecyclerView.Adapter<LongListRecyclerViewAdapter.Holder> { +public class LongListRecyclerViewAdapter + extends RecyclerView.Adapter<LongListRecyclerViewAdapter.Holder> { // For custom listener. public interface SwitchChangeListener { @@ -43,8 +43,8 @@ public class LongListRecyclerViewAdapter extends private Switch mSwitchWidget; private Context mContext; - public LongListRecyclerViewAdapter(Context context, List<AppItem> items, - SwitchChangeListener switchChangeListener) { + public LongListRecyclerViewAdapter( + Context context, List<AppItem> items, SwitchChangeListener switchChangeListener) { mContext = context; mItems = items; mInflater = LayoutInflater.from(context); @@ -71,23 +71,29 @@ public class LongListRecyclerViewAdapter extends mSwitchWidget = view.findViewById(R.id.switch_widget); - view.setContentDescription(mContext.getResources(). - getString(R.string.switch_bottom_action_drawer, - getSwitchToggleString(mSwitchWidget.isChecked()))); + view.setContentDescription( + mContext.getResources() + .getString( + R.string.switch_bottom_action_drawer, + getSwitchToggleString(mSwitchWidget.isChecked()))); // Set the OnClickListener (Observer pattern used here). - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mSwitchWidget.setChecked(!(mSwitchWidget.isChecked())); - if (mSwitchChangeListener != null) { - mSwitchChangeListener.onChange(mSwitchWidget.isChecked()); - } - view.setContentDescription(mContext.getResources(). - getString(R.string.switch_bottom_action_drawer, - getSwitchToggleString(mSwitchWidget.isChecked()))); - } - }); + view.setOnClickListener( + new OnClickListener() { + @Override + public void onClick(View v) { + mSwitchWidget.setChecked(!(mSwitchWidget.isChecked())); + if (mSwitchChangeListener != null) { + mSwitchChangeListener.onChange(mSwitchWidget.isChecked()); + } + view.setContentDescription( + mContext.getResources() + .getString( + R.string.switch_bottom_action_drawer, + getSwitchToggleString( + mSwitchWidget.isChecked()))); + } + }); break; case SampleAppConstants.HEADER_FOOTER: view = mInflater.inflate(R.layout.header_footer_layout, parent, false); @@ -153,12 +159,10 @@ public class LongListRecyclerViewAdapter extends mImageView = itemView.findViewById(R.id.shifted_icon_image_view); } - /** - * Bind appItem info to main screen (displays the item). - */ + /** Bind appItem info to main screen (displays the item). */ public void bind(AppItem item) { mTextView.setText(item.getItemName()); mImageView.setImageResource(item.getImageId()); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MainActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MainActivity.java index 6f510866..d5fc7eff 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MainActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MainActivity.java @@ -29,27 +29,42 @@ public class MainActivity extends WearableActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - //Menu items + // Menu items List<AppItem> items = new ArrayList<AppItem>(); - items.add(new AppItem(getString(R.string.lists), - R.drawable.lists_circle, ListsActivity.class)); - items.add(new AppItem(getString(R.string.dialogs), - R.drawable.dialogs_circle, DialogsActivity.class)); - items.add(new AppItem(getString(R.string.progress), - R.drawable.progress_circle, ProgressActivity.class)); - items.add(new AppItem(getString(R.string.controls), - R.drawable.controls_circle, ControlsActivity.class)); - items.add(new AppItem(getString(R.string.notifications), - R.drawable.notifications_circle, NotificationsActivity.class)); - items.add(new AppItem(getString(R.string.accessibility), - R.drawable.accessibility_circle, AccessibilityActivity.class)); + items.add( + new AppItem( + getString(R.string.lists), R.drawable.lists_circle, ListsActivity.class)); + items.add( + new AppItem( + getString(R.string.dialogs), + R.drawable.dialogs_circle, + DialogsActivity.class)); + items.add( + new AppItem( + getString(R.string.progress), + R.drawable.progress_circle, + ProgressActivity.class)); + items.add( + new AppItem( + getString(R.string.controls), + R.drawable.controls_circle, + ControlsActivity.class)); + items.add( + new AppItem( + getString(R.string.notifications), + R.drawable.notifications_circle, + NotificationsActivity.class)); + items.add( + new AppItem( + getString(R.string.accessibility), + R.drawable.accessibility_circle, + AccessibilityActivity.class)); MenuRecyclerViewAdapter appListAdapter = new MenuRecyclerViewAdapter(this, items); WearableRecyclerView recyclerView = findViewById(R.id.main_recycler_view); recyclerView.setAdapter(appListAdapter); - recyclerView - .setLayoutManager(new MyLauncherChildLayoutManager(this)); // For curved layout. + recyclerView.setLayoutManager(new MyLauncherChildLayoutManager(this)); // For curved layout. recyclerView.setCenterEdgeItems(true); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MenuRecyclerViewAdapter.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MenuRecyclerViewAdapter.java index aafd9104..e5367625 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MenuRecyclerViewAdapter.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MenuRecyclerViewAdapter.java @@ -26,8 +26,7 @@ import android.widget.TextView; import java.util.List; -public class MenuRecyclerViewAdapter extends - RecyclerView.Adapter<MenuRecyclerViewAdapter.Holder> { +public class MenuRecyclerViewAdapter extends RecyclerView.Adapter<MenuRecyclerViewAdapter.Holder> { private final Context mContext; private final LayoutInflater mInflater; @@ -42,7 +41,7 @@ public class MenuRecyclerViewAdapter extends @Override public Holder onCreateViewHolder(ViewGroup parent, int viewType) { /* Add check for viewType here if used. - See LongListRecyclerViewAdapter for an example. */ + See LongListRecyclerViewAdapter for an example. */ return new Holder(mInflater.inflate(R.layout.app_item_layout, parent, false)); } @@ -62,12 +61,13 @@ public class MenuRecyclerViewAdapter extends // Start new activity on click of specific item. final int pos = position; - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mItems.get(pos).launchActivity(mContext); - } - }); + holder.itemView.setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + mItems.get(pos).launchActivity(mContext); + } + }); } @Override @@ -80,7 +80,6 @@ public class MenuRecyclerViewAdapter extends return mItems.get(position).getViewType(); } - static class Holder extends ViewHolder { TextView mTextView; ImageView mImageView; @@ -91,12 +90,10 @@ public class MenuRecyclerViewAdapter extends mImageView = itemView.findViewById(R.id.icon_image_view); } - /** - * Bind appItem info to main screen (displays the item). - */ + /** Bind appItem info to main screen (displays the item). */ public void bind(AppItem item) { mTextView.setText(item.getItemName()); mImageView.setImageResource(item.getImageId()); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingIntentService.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingIntentService.java index d04f043c..b8e998f9 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingIntentService.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingIntentService.java @@ -41,7 +41,6 @@ public class MessagingIntentService extends IntentService { public static final String EXTRA_REPLY = "com.example.android.wearable.wear.wearnotifications.handlers.extra.REPLY"; - public MessagingIntentService() { super("MessagingIntentService"); } @@ -58,9 +57,7 @@ public class MessagingIntentService extends IntentService { } } - /** - * Handles action for replying to messages from the notification. - */ + /** Handles action for replying to messages from the notification. */ private void handleActionReply(CharSequence replyCharSequence) { Log.d(TAG, "handleActionReply(): " + replyCharSequence); @@ -96,21 +93,18 @@ public class MessagingIntentService extends IntentService { notificationCompatBuilder = recreateBuilderWithMessagingStyle(); } - // Since we are adding to the MessagingStyle, we need to first retrieve the // current MessagingStyle from the Notification itself. Notification notification = notificationCompatBuilder.build(); MessagingStyle messagingStyle = - NotificationCompat.MessagingStyle - .extractMessagingStyleFromNotification(notification); + NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification( + notification); // Add new message to the MessagingStyle messagingStyle.addMessage(replyCharSequence, System.currentTimeMillis(), null); // Updates the Notification - notification = notificationCompatBuilder - .setStyle(messagingStyle) - .build(); + notification = notificationCompatBuilder.setStyle(messagingStyle).build(); // Pushes out the updated Notification NotificationManagerCompat notificationManagerCompat = @@ -161,16 +155,18 @@ public class MessagingIntentService extends IntentService { messagingStyle.addMessage(message); } - // 2. Add support for Wear 1.+. String fullMessageForWearVersion1 = messagingStyleCommsAppData.getFullConversation(); - Notification chatHistoryForWearV1 = new NotificationCompat.Builder(getApplicationContext()) - .setStyle(new NotificationCompat.BigTextStyle().bigText(fullMessageForWearVersion1)) - .setContentTitle(contentTitle) - .setSmallIcon(R.drawable.watch) - .setContentText(fullMessageForWearVersion1) - .build(); + Notification chatHistoryForWearV1 = + new NotificationCompat.Builder(getApplicationContext()) + .setStyle( + new NotificationCompat.BigTextStyle() + .bigText(fullMessageForWearVersion1)) + .setContentTitle(contentTitle) + .setSmallIcon(R.drawable.watch) + .setContentText(fullMessageForWearVersion1) + .build(); // Adds page with all text to support Wear 1.+. NotificationCompat.WearableExtender wearableExtenderForWearVersion1 = @@ -182,20 +178,15 @@ public class MessagingIntentService extends IntentService { Intent notifyIntent = new Intent(this, MessagingMainActivity.class); PendingIntent mainPendingIntent = - PendingIntent.getActivity( - this, - 0, - notifyIntent, - PendingIntent.FLAG_UPDATE_CURRENT - ); - + PendingIntent.getActivity(this, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT); // 4. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) directly // from the notification without entering the app. String replyLabel = getString(R.string.reply_label); - RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY) - .setLabel(replyLabel) - .build(); + RemoteInput remoteInput = + new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY) + .setLabel(replyLabel) + .build(); Intent replyIntent = new Intent(this, MessagingIntentService.class); replyIntent.setAction(MessagingIntentService.ACTION_REPLY); @@ -210,9 +201,7 @@ public class MessagingIntentService extends IntentService { NotificationCompat.Action replyAction = new NotificationCompat.Action.Builder( - R.drawable.reply, - replyLabel, - replyActionPendingIntent) + R.drawable.reply, replyLabel, replyActionPendingIntent) .addRemoteInput(remoteInput) // Allows system to generate replies by context of conversation .setAllowGeneratedReplies(true) @@ -220,7 +209,6 @@ public class MessagingIntentService extends IntentService { .extend(inlineActionForWear2_0) .build(); - // 5. Build and issue the notification NotificationCompat.Builder notificationCompatBuilder = new NotificationCompat.Builder(getApplicationContext()); @@ -233,9 +221,7 @@ public class MessagingIntentService extends IntentService { .setContentTitle(contentTitle) .setContentText(messagingStyleCommsAppData.getContentText()) .setSmallIcon(R.drawable.watch) - .setLargeIcon(BitmapFactory.decodeResource( - getResources(), - R.drawable.avatar)) + .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.avatar)) .setContentIntent(mainPendingIntent) .setSubText(Integer.toString(messagingStyleCommsAppData.getNumberOfNewMessages())) .addAction(replyAction) @@ -250,4 +236,4 @@ public class MessagingIntentService extends IntentService { return notificationCompatBuilder; } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingMainActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingMainActivity.java index e9935ce7..a33cad99 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingMainActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MessagingMainActivity.java @@ -37,4 +37,4 @@ public class MessagingMainActivity extends Activity { notificationManager.cancel(NotificationsActivity.NOTIFICATION_ID); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MockDatabase.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MockDatabase.java index 5fad495b..f5b8f0db 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MockDatabase.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MockDatabase.java @@ -19,18 +19,14 @@ import android.support.v4.app.NotificationCompat.MessagingStyle; import java.util.ArrayList; -/** - * Mock data for each of the Notification Style Demos. - */ +/** Mock data for each of the Notification Style Demos. */ public final class MockDatabase { public static MessagingStyleCommsAppData getMessagingStyleData() { return MessagingStyleCommsAppData.getInstance(); } - /** - * Represents data needed for MessagingStyle Notification. - */ + /** Represents data needed for MessagingStyle Notification. */ public static class MessagingStyleCommsAppData { private static MessagingStyleCommsAppData sInstance = null; @@ -75,28 +71,28 @@ public final class MockDatabase { long currentTime = System.currentTimeMillis(); mMessages = new ArrayList<>(); - mMessages.add(new MessagingStyle.Message( - "What are you doing tonight?", currentTime - 4000, "Famous")); - mMessages.add(new MessagingStyle.Message( - "I don't know, dinner maybe?", currentTime - 3000, null)); - mMessages.add(new MessagingStyle.Message( - "Sounds good.", currentTime - 2000, "Famous")); - mMessages.add(new MessagingStyle.Message( - "How about BBQ?", currentTime - 1000, null)); + mMessages.add( + new MessagingStyle.Message( + "What are you doing tonight?", currentTime - 4000, "Famous")); + mMessages.add( + new MessagingStyle.Message( + "I don't know, dinner maybe?", currentTime - 3000, null)); + mMessages.add(new MessagingStyle.Message("Sounds good.", currentTime - 2000, "Famous")); + mMessages.add(new MessagingStyle.Message("How about BBQ?", currentTime - 1000, null)); // Last two are the newest message (2) from friend - mMessages.add(new MessagingStyle.Message( - "Dude!", currentTime, "Famous")); - mMessages.add(new MessagingStyle.Message( - "You know I am a Pesce-pescetarian. :P", currentTime, "Famous")); - + mMessages.add(new MessagingStyle.Message("Dude!", currentTime, "Famous")); + mMessages.add( + new MessagingStyle.Message( + "You know I am a Pesce-pescetarian. :P", currentTime, "Famous")); // String version of the mMessages above - mFullConversation = "Famous: What are you doing tonight?\n\n" - + "Me: I don't know, dinner maybe?\n\n" - + "Famous: Sounds good.\n\n" - + "Me: How about BBQ?\n\n" - + "Famous: Dude!\n\n" - + "Famous: You know I am a Pesce-pescetarian. :P\n\n"; + mFullConversation = + "Famous: What are you doing tonight?\n\n" + + "Me: I don't know, dinner maybe?\n\n" + + "Famous: Sounds good.\n\n" + + "Me: How about BBQ?\n\n" + + "Famous: Dude!\n\n" + + "Famous: You know I am a Pesce-pescetarian. :P\n\n"; mNumberOfNewMessages = 2; @@ -107,7 +103,6 @@ public final class MockDatabase { // the user(s) is starred as a favorite. mParticipants = new ArrayList<>(); mParticipants.add("Famous McFamously"); - } public String getContentTitle() { @@ -143,4 +138,4 @@ public final class MockDatabase { return getFullConversation(); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MyLauncherChildLayoutManager.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MyLauncherChildLayoutManager.java index 910e8361..44b3c75c 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MyLauncherChildLayoutManager.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/MyLauncherChildLayoutManager.java @@ -22,9 +22,7 @@ import android.view.View; public class MyLauncherChildLayoutManager extends CurvedChildLayoutManager { - /** - * How much should we scale the icon at most. - */ + /** How much should we scale the icon at most. */ private static final float MAX_ICON_PROGRESS = 0.65f; public MyLauncherChildLayoutManager(Context context) { @@ -48,4 +46,4 @@ public class MyLauncherChildLayoutManager extends CurvedChildLayoutManager { child.setScaleX(1 - progressToCenter); child.setScaleY(1 - progressToCenter); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/NotificationsActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/NotificationsActivity.java index 1470f5ad..2cf8bd75 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/NotificationsActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/NotificationsActivity.java @@ -40,7 +40,8 @@ public class NotificationsActivity extends WearableActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Display the fragment as the main content. - getFragmentManager().beginTransaction() + getFragmentManager() + .beginTransaction() .replace(android.R.id.content, new NotificationsPrefsFragment()) .commit(); } @@ -49,8 +50,8 @@ public class NotificationsActivity extends WearableActivity { private static final String TAG = "NotificationsActivity"; private NotificationManagerCompat mNotificationManagerCompat; - private boolean mActionOn; //if true, displays in-line action - private boolean mAvatarOn; //if true, displays avatar of messenger + private boolean mActionOn; // if true, displays in-line action + private boolean mAvatarOn; // if true, displays avatar of messenger @Override public void onCreate(Bundle savedInstanceState) { @@ -61,12 +62,12 @@ public class NotificationsActivity extends WearableActivity { mNotificationManagerCompat = NotificationManagerCompat.from(getActivity()); - final SwitchPreference mActionSwitchPref = (SwitchPreference) findPreference( - getString(R.string.key_pref_action)); - final SwitchPreference mAvatarSwitchPref = (SwitchPreference) findPreference( - getString(R.string.key_pref_avatar)); - Preference mPushNotificationPref = findPreference( - getString(R.string.key_pref_push_notification)); + final SwitchPreference mActionSwitchPref = + (SwitchPreference) findPreference(getString(R.string.key_pref_action)); + final SwitchPreference mAvatarSwitchPref = + (SwitchPreference) findPreference(getString(R.string.key_pref_avatar)); + Preference mPushNotificationPref = + findPreference(getString(R.string.key_pref_push_notification)); initInLineAction(mActionSwitchPref); initAvatar(mAvatarSwitchPref); @@ -76,56 +77,59 @@ public class NotificationsActivity extends WearableActivity { public void initInLineAction(SwitchPreference switchPref) { switchPref.setChecked(true); mActionOn = switchPref.isChecked(); - switchPref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - mActionOn = (Boolean) newValue; - return true; - } - }); + switchPref.setOnPreferenceChangeListener( + new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + mActionOn = (Boolean) newValue; + return true; + } + }); } public void initAvatar(SwitchPreference switchPref) { switchPref.setChecked(true); mAvatarOn = switchPref.isChecked(); - switchPref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - mAvatarOn = (Boolean) newValue; - return true; - } - }); + switchPref.setOnPreferenceChangeListener( + new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + mAvatarOn = (Boolean) newValue; + return true; + } + }); } public void initPushNotification(Preference pref) { - pref.setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - generateMessagingStyleNotification(); - return true; - } - }); + pref.setOnPreferenceClickListener( + new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + generateMessagingStyleNotification(); + return true; + } + }); } /* - * Generates a MESSAGING_STYLE Notification that supports both Wear 1.+ and Wear 2.0. For - * devices on API level 24 (Wear 2.0) and after, displays MESSAGING_STYLE. Otherwise, - * displays a basic BIG_TEXT_STYLE. - * - * IMPORTANT NOTE: - * Notification Styles behave slightly different on Wear 2.0 when they are launched by a - * native/local Wear app, i.e., they will NOT expand when the user taps them but will - * instead take the user directly into the local app for the richest experience. In - * contrast, a bridged Notification launched from the phone will expand with the style - * details (whether there is a local app or not). - * - * If you want to enable an action on your Notification without launching the app, you can - * do so with the setHintDisplayActionInline() feature (shown below), but this only allows - * one action. - * - * If you wish to replicate the original experience of a bridged notification, please - * review the generateBigTextStyleNotification() method above to see how. - */ + * Generates a MESSAGING_STYLE Notification that supports both Wear 1.+ and Wear 2.0. For + * devices on API level 24 (Wear 2.0) and after, displays MESSAGING_STYLE. Otherwise, + * displays a basic BIG_TEXT_STYLE. + * + * IMPORTANT NOTE: + * Notification Styles behave slightly different on Wear 2.0 when they are launched by a + * native/local Wear app, i.e., they will NOT expand when the user taps them but will + * instead take the user directly into the local app for the richest experience. In + * contrast, a bridged Notification launched from the phone will expand with the style + * details (whether there is a local app or not). + * + * If you want to enable an action on your Notification without launching the app, you can + * do so with the setHintDisplayActionInline() feature (shown below), but this only allows + * one action. + * + * If you wish to replicate the original experience of a bridged notification, please + * review the generateBigTextStyleNotification() method above to see how. + */ private void generateMessagingStyleNotification() { Log.d(TAG, "generateMessagingStyleNotification()"); @@ -143,12 +147,14 @@ public class NotificationsActivity extends WearableActivity { // 1. Build the Notification.Style (MESSAGING_STYLE) String contentTitle = messagingStyleCommsAppData.getContentTitle(); - MessagingStyle messagingStyle = new NotificationCompat - .MessagingStyle(messagingStyleCommsAppData.getReplayName()) - // You could set a different title to appear when the messaging style - // is supported on device (24+) if you wish. In our case, we use the same - // title. - .setConversationTitle(contentTitle); + MessagingStyle messagingStyle = + new NotificationCompat.MessagingStyle( + messagingStyleCommsAppData.getReplayName()) + // You could set a different title to appear when the messaging style + // is supported on device (24+) if you wish. In our case, we use the + // same + // title. + .setConversationTitle(contentTitle); // Adds all Messages // Note: Messages include the text, timestamp, and sender @@ -161,21 +167,17 @@ public class NotificationsActivity extends WearableActivity { PendingIntent mainPendingIntent = PendingIntent.getActivity( - getActivity(), - 0, - notifyIntent, - PendingIntent.FLAG_UPDATE_CURRENT - ); - + getActivity(), 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT); // 3. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) // directly from the notification without entering the app. // Create the RemoteInput specifying this key. String replyLabel = getString(R.string.reply_label); - RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY) - .setLabel(replyLabel) - .build(); + RemoteInput remoteInput = + new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY) + .setLabel(replyLabel) + .build(); // Create PendingIntent for service that handles input. Intent replyIntent = new Intent(getActivity(), MessagingIntentService.class); @@ -190,17 +192,15 @@ public class NotificationsActivity extends WearableActivity { .setHintDisplayActionInline(mActionOn) .setHintLaunchesActivity(false); - NotificationCompat.Action replyAction = new NotificationCompat.Action.Builder( - R.drawable.reply, - replyLabel, - replyActionPendingIntent) - .addRemoteInput(remoteInput) - // Allows system to generate replies by context of conversation - .setAllowGeneratedReplies(true) - // Add WearableExtender to enable inline actions - .extend(inlineActionForWear2) - .build(); - + NotificationCompat.Action replyAction = + new NotificationCompat.Action.Builder( + R.drawable.reply, replyLabel, replyActionPendingIntent) + .addRemoteInput(remoteInput) + // Allows system to generate replies by context of conversation + .setAllowGeneratedReplies(true) + // Add WearableExtender to enable inline actions + .extend(inlineActionForWear2) + .build(); // 4. Build and issue the notification @@ -211,8 +211,8 @@ public class NotificationsActivity extends WearableActivity { NotificationCompat.Builder notificationCompatBuilder = new NotificationCompat.Builder(getActivity()); - GlobalNotificationBuilder - .setNotificationCompatBuilderInstance(notificationCompatBuilder); + GlobalNotificationBuilder.setNotificationCompatBuilderInstance( + notificationCompatBuilder); // Builds and issues notification notificationCompatBuilder @@ -224,9 +224,8 @@ public class NotificationsActivity extends WearableActivity { .setContentIntent(mainPendingIntent) // Number of new notifications for API <24 (Wear 1.+) devices - .setSubText(Integer.toString(messagingStyleCommsAppData - .getNumberOfNewMessages())) - + .setSubText( + Integer.toString(messagingStyleCommsAppData.getNumberOfNewMessages())) .addAction(replyAction) .setCategory(Notification.CATEGORY_MESSAGE) .setPriority(Notification.PRIORITY_HIGH) @@ -234,9 +233,9 @@ public class NotificationsActivity extends WearableActivity { // Hides content on the lock-screen .setVisibility(Notification.VISIBILITY_PRIVATE); - notificationCompatBuilder.setLargeIcon(BitmapFactory.decodeResource(getResources(), - mAvatarOn ? R.drawable.avatar : R.drawable.watch)); - + notificationCompatBuilder.setLargeIcon( + BitmapFactory.decodeResource( + getResources(), mAvatarOn ? R.drawable.avatar : R.drawable.watch)); // If the phone is in "Do not disturb mode, the user will still be notified if // the sender(s) is starred as a favorite. @@ -251,4 +250,4 @@ public class NotificationsActivity extends WearableActivity { getActivity().finish(); } } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/OpenOnPhoneAnimationActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/OpenOnPhoneAnimationActivity.java index 261b1b51..51d9bdff 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/OpenOnPhoneAnimationActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/OpenOnPhoneAnimationActivity.java @@ -31,19 +31,19 @@ public class OpenOnPhoneAnimationActivity extends WearableActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_open_on_phone_animation); - mAnimationCallback = new AnimationCallback() { - @Override - public void onAnimationEnd(Drawable drawable) { - super.onAnimationEnd(drawable); - // Go back to main Dialogs screen after animation. - finish(); - } - }; + mAnimationCallback = + new AnimationCallback() { + @Override + public void onAnimationEnd(Drawable drawable) { + super.onAnimationEnd(drawable); + // Go back to main Dialogs screen after animation. + finish(); + } + }; // Play 'swipe left' animation only once. ImageView phoneImage = findViewById(R.id.open_on_phone_animation_image); - mAnimatedVectorDrawablePhone = - (AnimatedVectorDrawable) phoneImage.getDrawable(); + mAnimatedVectorDrawablePhone = (AnimatedVectorDrawable) phoneImage.getDrawable(); mAnimatedVectorDrawablePhone.registerAnimationCallback(mAnimationCallback); mAnimatedVectorDrawablePhone.start(); } @@ -53,4 +53,4 @@ public class OpenOnPhoneAnimationActivity extends WearableActivity { super.onDestroy(); mAnimatedVectorDrawablePhone.unregisterAnimationCallback(mAnimationCallback); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/PhotoCarouselActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/PhotoCarouselActivity.java index 185e5506..6c07384f 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/PhotoCarouselActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/PhotoCarouselActivity.java @@ -50,8 +50,7 @@ public class PhotoCarouselActivity extends WearableActivity implements OnClickLi @Override public void onClick(View v) { Intent intent = new Intent(getApplicationContext(), ZoomImageActivity.class); - intent.putExtra(getString(R.string.intent_extra_image), - (int) v.getTag()); + intent.putExtra(getString(R.string.intent_extra_image), (int) v.getTag()); startActivity(intent); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressActivity.java index b7359dce..e385f6b2 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressActivity.java @@ -55,12 +55,14 @@ public class ProgressActivity extends WearableActivity { // Goes to a new screen when you click on one of the list items. // Dependent upon position of click. - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - mItems.get(position - listView.getHeaderViewsCount()) - .launchActivity(getApplicationContext()); - } - }); + listView.setOnItemClickListener( + new AdapterView.OnItemClickListener() { + @Override + public void onItemClick( + AdapterView<?> parent, View view, int position, long id) { + mItems.get(position - listView.getHeaderViewsCount()) + .launchActivity(getApplicationContext()); + } + }); } } diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressBarPreference.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressBarPreference.java index b644fd95..b19195e8 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressBarPreference.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ProgressBarPreference.java @@ -32,12 +32,11 @@ public class ProgressBarPreference extends Preference { super(context); } - @Override protected View onCreateView(ViewGroup parent) { super.onCreateView(parent); - LayoutInflater inflater = (LayoutInflater) getContext() - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater inflater = + (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); return inflater.inflate(R.layout.progress_bar_with_text_layout, parent, false); } } diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/RadioListActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/RadioListActivity.java index fb267c7c..978d49db 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/RadioListActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/RadioListActivity.java @@ -29,4 +29,4 @@ public class RadioListActivity extends WearableActivity { TextView titleView = findViewById(R.id.radio_list_title); titleView.setText(R.string.radio_list); } -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/SampleAppConstants.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/SampleAppConstants.java index 7d154322..b259980e 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/SampleAppConstants.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/SampleAppConstants.java @@ -16,35 +16,24 @@ package com.example.android.wearable.wear.wearaccessibilityapp; public class SampleAppConstants { - /** - * {@value #NORMAL} Used when sending information to an Adapter class - */ + /** {@value #NORMAL} Used when sending information to an Adapter class */ public static final int NORMAL = 1; - /** - * {@value #HEADER_FOOTER} Used when sending information to an Adapter class - */ + /** {@value #HEADER_FOOTER} Used when sending information to an Adapter class */ public static final int HEADER_FOOTER = 2; - /** - * {@value #PROGRESS_BAR} Used when sending information to an Adapter class - */ + /** {@value #PROGRESS_BAR} Used when sending information to an Adapter class */ public static final int PROGRESS_BAR = 3; - /** - * {@value #SWITCH} Used when sending information to an Adapter class - */ + /** {@value #SWITCH} Used when sending information to an Adapter class */ public static final int SWITCH = 4; - /** - * {@value #TITLE} Used when sending information to an Adapter class - */ + /** {@value #TITLE} Used when sending information to an Adapter class */ public static final int TITLE = 5; /** - * {@value #END_OF_LONG_LIST} - * Used to check if at the end of long list - * Used in LongListRecyclerviewAdapter + * {@value #END_OF_LONG_LIST} Used to check if at the end of long list Used in + * LongListRecyclerviewAdapter */ public static final int END_OF_LONG_LIST = 45; -}
\ No newline at end of file +} diff --git a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ZoomImageActivity.java b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ZoomImageActivity.java index 8f1bbfdf..efd16427 100644 --- a/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ZoomImageActivity.java +++ b/wearable/wear/WearAccessibilityApp/Wearable/src/main/java/com/example/android/wearable/wear/wearaccessibilityapp/ZoomImageActivity.java @@ -28,7 +28,7 @@ public class ZoomImageActivity extends WearableActivity { setContentView(R.layout.activity_zoom_image); // Check if integer was actually given. - if(!(getIntent().hasExtra(getString(R.string.intent_extra_image)))) { + if (!(getIntent().hasExtra(getString(R.string.intent_extra_image)))) { throw new NotFoundException("Expecting extras"); } @@ -37,4 +37,4 @@ public class ZoomImageActivity extends WearableActivity { ImageView expandedImage = findViewById(R.id.expanded_image); expandedImage.setImageResource(value); } -}
\ No newline at end of file +} |