diff options
| author | Jeremy Walker <jewalker@google.com> | 2016-05-20 20:34:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-20 20:34:19 +0000 |
| commit | 336c996f49cb2fcef8a18d30f2127e0821bc1ade (patch) | |
| tree | 32e8ff5e7596799fd0e99a35fdd93229e1521d34 | |
| parent | a9d2784f71ad94757d2f6edae07dc71e09a518d0 (diff) | |
| parent | 878180033b0c76a01f808f69ad211bbb5590cf40 (diff) | |
| download | android-336c996f49cb2fcef8a18d30f2127e0821bc1ade.tar.gz | |
Updates WearDrawer sample to use app:action_menu XML and removes code for inflating action menu.
am: 878180033b
* commit '878180033b0c76a01f808f69ad211bbb5590cf40':
Updates WearDrawer sample to use app:action_menu XML and removes code for inflating action menu.
Change-Id: I6eff970290a344fe0813e3da1ca89af19b1065a3
2 files changed, 5 insertions, 4 deletions
diff --git a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java index cd4cd2e9..f2e00c05 100644 --- a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java +++ b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java @@ -85,17 +85,16 @@ public class MainActivity extends WearableActivity implements mWearableNavigationDrawer = (WearableNavigationDrawer) findViewById(R.id.top_navigation_drawer); mWearableNavigationDrawer.setAdapter(new NavigationAdapter(this)); + // Peeks Navigation drawer on the top. mWearableDrawerLayout.peekDrawer(Gravity.TOP); // Bottom Action Drawer mWearableActionDrawer = (WearableActionDrawer) findViewById(R.id.bottom_action_drawer); - // Populate Action Drawer Menu - Menu menu = mWearableActionDrawer.getMenu(); - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.action_drawer_menu, menu); + mWearableActionDrawer.setOnMenuItemClickListener(this); + // Peeks action drawer on the bottom. mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM); diff --git a/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml index 48bc3c5c..97e03668 100644 --- a/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml +++ b/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml @@ -17,6 +17,7 @@ <android.support.wearable.view.drawer.WearableDrawerLayout android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -38,6 +39,7 @@ android:id="@+id/bottom_action_drawer" android:layout_width="match_parent" android:layout_height="match_parent" + app:action_menu="@menu/action_drawer_menu" android:background="@color/grey"/> </android.support.wearable.view.drawer.WearableDrawerLayout>
\ No newline at end of file |