resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67

am: b5dfaab473

Change-Id: Ife6b59d2c9c3ff193afe1b0bb1a51e216eee5eb6

2 files changed, 282 insertions, 0 deletions

diff --git a/samples/browseable/WearDrawers/res/layout/activity_main.xml b/samples/browseable/WearDrawers/res/layout/activity_main.xml
new file mode 100644
index 000000000..97e036682
--- /dev/null
+++ b/samples/browseable/WearDrawers/res/layout/activity_main.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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"
+    tools:context="com.example.android.wearable.wear.weardrawers.MainActivity"
+    tools:deviceIds="wear">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/content_frame"/>
+
+    <android.support.wearable.view.drawer.WearableNavigationDrawer
+        android:id="@+id/top_navigation_drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/dark_grey" />
+
+    <android.support.wearable.view.drawer.WearableActionDrawer
+        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
diff --git a/samples/browseable/WearDrawers/src/com.example.android.wearable.wear.weardrawers/MainActivity.java b/samples/browseable/WearDrawers/src/com.example.android.wearable.wear.weardrawers/MainActivity.java
new file mode 100644
index 000000000..f2e00c056
--- /dev/null
+++ b/samples/browseable/WearDrawers/src/com.example.android.wearable.wear.weardrawers/MainActivity.java
@@ -0,0 +1,237 @@
+/*
+Copyright 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+package com.example.android.wearable.wear.weardrawers;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.wearable.activity.WearableActivity;
+import android.support.wearable.view.drawer.WearableActionDrawer;
+import android.support.wearable.view.drawer.WearableDrawerLayout;
+import android.support.wearable.view.drawer.WearableNavigationDrawer;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+
+/**
+ * Demonstrates use of Navigation and Action Drawers on Android Wear.
+ */
+public class MainActivity extends WearableActivity implements
+        WearableActionDrawer.OnMenuItemClickListener {
+
+    private static final String TAG = "MainActivity";
+
+    private WearableDrawerLayout mWearableDrawerLayout;
+    private WearableNavigationDrawer mWearableNavigationDrawer;
+    private WearableActionDrawer mWearableActionDrawer;
+
+    private ArrayList<Planet> mSolarSystem;
+    private int mSelectedPlanet;
+
+    private PlanetFragment mPlanetFragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.d(TAG, "onCreate()");
+
+        setContentView(R.layout.activity_main);
+        setAmbientEnabled();
+
+        mSolarSystem = initializeSolarSystem();
+        mSelectedPlanet = 0;
+
+        // Initialize content to first planet.
+        mPlanetFragment = new PlanetFragment();
+        Bundle args = new Bundle();
+
+        int imageId = getResources().getIdentifier(mSolarSystem.get(mSelectedPlanet).getImage(),
+                "drawable", getPackageName());
+
+
+        args.putInt(PlanetFragment.ARG_PLANET_IMAGE_ID, imageId);
+        mPlanetFragment.setArguments(args);
+        FragmentManager fragmentManager = getFragmentManager();
+        fragmentManager.beginTransaction().replace(R.id.content_frame, mPlanetFragment).commit();
+
+        // Main Wearable Drawer Layout that wraps all content
+        mWearableDrawerLayout = (WearableDrawerLayout) findViewById(R.id.drawer_layout);
+
+        // Top Navigation Drawer
+        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);
+
+        mWearableActionDrawer.setOnMenuItemClickListener(this);
+
+        // Peeks action drawer on the bottom.
+        mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM);
+
+        /* Action Drawer Tip: If you only have a single action for your Action Drawer, you can use a
+         * (custom) View to peek on top of the content by calling
+         * mWearableActionDrawer.setPeekContent(View). Make sure you set a click listener to handle
+         * a user clicking on your View.
+         */
+    }
+
+    private ArrayList<Planet> initializeSolarSystem() {
+        ArrayList<Planet> solarSystem = new ArrayList<Planet>();
+        String[] planetArrayNames = getResources().getStringArray(R.array.planets_array_names);
+
+        for (int i = 0; i < planetArrayNames.length; i++) {
+            String planet = planetArrayNames[i];
+            int planetResourceId =
+                    getResources().getIdentifier(planet, "array", getPackageName());
+            String[] planetInformation = getResources().getStringArray(planetResourceId);
+
+            solarSystem.add(new Planet(
+                    planetInformation[0],   // Name
+                    planetInformation[1],   // Navigation icon
+                    planetInformation[2],   // Image icon
+                    planetInformation[3],   // Moons
+                    planetInformation[4],   // Volume
+                    planetInformation[5])); // Surface area
+        }
+
+        return solarSystem;
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem menuItem) {
+        Log.d(TAG, "onMenuItemClick(): " + menuItem);
+
+        final int itemId = menuItem.getItemId();
+
+        String toastMessage = "";
+
+        switch (itemId) {
+            case R.id.menu_planet_name:
+                toastMessage = mSolarSystem.get(mSelectedPlanet).getName();
+                break;
+            case R.id.menu_number_of_moons:
+                toastMessage = mSolarSystem.get(mSelectedPlanet).getMoons();
+                break;
+            case R.id.menu_volume:
+                toastMessage = mSolarSystem.get(mSelectedPlanet).getVolume();
+                break;
+            case R.id.menu_surface_area:
+                toastMessage = mSolarSystem.get(mSelectedPlanet).getSurfaceArea();
+                break;
+        }
+
+        mWearableDrawerLayout.closeDrawer(mWearableActionDrawer);
+
+        if (toastMessage.length() > 0) {
+            Toast toast = Toast.makeText(
+                    getApplicationContext(),
+                    toastMessage,
+                    Toast.LENGTH_SHORT);
+            toast.show();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private final class NavigationAdapter
+            extends WearableNavigationDrawer.WearableNavigationDrawerAdapter {
+
+        private final Context mContext;
+
+        public NavigationAdapter(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public int getCount() {
+            return mSolarSystem.size();
+        }
+
+        @Override
+        public void onItemSelected(int position) {
+            Log.d(TAG, "WearableNavigationDrawerAdapter.onItemSelected(): " + position);
+            mSelectedPlanet = position;
+
+            String selectedPlanetImage = mSolarSystem.get(mSelectedPlanet).getImage();
+            int drawableId =
+                    getResources().getIdentifier(selectedPlanetImage, "drawable", getPackageName());
+            mPlanetFragment.updatePlanet(drawableId);
+        }
+
+        @Override
+        public String getItemText(int pos) {
+            return mSolarSystem.get(pos).getName();
+        }
+
+        @Override
+        public Drawable getItemDrawable(int pos) {
+            String navigationIcon = mSolarSystem.get(pos).getNavigationIcon();
+
+            int drawableNavigationIconId =
+                    getResources().getIdentifier(navigationIcon, "drawable", getPackageName());
+
+            return mContext.getDrawable(drawableNavigationIconId);
+        }
+    }
+
+    /**
+     * Fragment that appears in the "content_frame", just shows the currently selected planet.
+     */
+    public static class PlanetFragment extends Fragment {
+        public static final String ARG_PLANET_IMAGE_ID = "planet_image_id";
+
+        private ImageView mImageView;
+
+        public PlanetFragment() {
+            // Empty constructor required for fragment subclasses
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            View rootView = inflater.inflate(R.layout.fragment_planet, container, false);
+
+            mImageView = ((ImageView) rootView.findViewById(R.id.image));
+
+            int imageIdToLoad = getArguments().getInt(ARG_PLANET_IMAGE_ID);
+            mImageView.setImageResource(imageIdToLoad);
+
+            return rootView;
+        }
+
+        public void updatePlanet(int imageId) {
+            mImageView.setImageResource(imageId);
+        }
+    }
+}
\ No newline at end of file