1 files changed, 34 insertions, 26 deletions

diff --git a/PermissionApp/src/foo/bar/permission/PermissionActivity.java b/PermissionApp/src/foo/bar/permission/PermissionActivity.java
index b61f511..a99106b 100644
--- a/PermissionApp/src/foo/bar/permission/PermissionActivity.java
+++ b/PermissionApp/src/foo/bar/permission/PermissionActivity.java
@@ -26,8 +26,9 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.CalendarContract;
 import android.provider.ContactsContract;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.CursorAdapter;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
@@ -35,8 +36,7 @@ import android.widget.SimpleCursorAdapter;
 /**
  * Simple sample of how to use the runtime permissions APIs.
  */
-public class PermissionActivity extends Activity implements View.OnClickListener,
-        LoaderManager.LoaderCallbacks<Cursor> {
+public class PermissionActivity extends Activity implements LoaderManager.LoaderCallbacks<Cursor> {
 
     public static final String LOG_TAG = "PermissionActivity";
 
@@ -73,9 +73,6 @@ public class PermissionActivity extends Activity implements View.OnClickListener
     };
 
     private ListView mListView;
-    private Button mContactsButton;
-    private Button mEventsButton;
-    private Button mPermissionsButton;
 
     private CursorAdapter mContactsAdapter;
     private CursorAdapter mEventsAdapter;
@@ -86,28 +83,46 @@ public class PermissionActivity extends Activity implements View.OnClickListener
         bindUi();
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(foo.bar.permission2.R.menu.actions, menu);
+        return true;
+    }
+
     @Override
-    public void onClick(View view) {
-        if (view == mContactsButton) {
-            showContacts();
-        } else if (view == mEventsButton) {
-            showEvents();
-        } else if (view == mPermissionsButton) {
-            requestPermissions();
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case foo.bar.permission2.R.id.show_contacts: {
+                showContacts();
+                return true;
+            }
+
+            case foo.bar.permission2.R.id.show_events: {
+                showEvents();
+                return true;
+            }
+
+            case foo.bar.permission2.R.id.request_all_perms: {
+                requestPermissions();
+                return true;
+            }
         }
+
+        return false;
     }
 
     @Override
     public Loader<Cursor> onCreateLoader(int loaderId, Bundle args) {
         switch (loaderId) {
             case CONTACTS_LOADER: {
-                return new CursorLoader(PermissionActivity.this,
+                return new CursorLoader(this,
                         ContactsContract.Contacts.CONTENT_URI,
                         CONTACTS_PROJECTION, null, null, null);
             }
 
             case EVENTS_LOADER: {
-                return new CursorLoader(PermissionActivity.this,
+                return new CursorLoader(this,
                         CalendarContract.Events.CONTENT_URI,
                         EVENTS_PROJECTION, null, null, null);
             }
@@ -163,18 +178,11 @@ public class PermissionActivity extends Activity implements View.OnClickListener
     }
 
     private void bindUi() {
-        setContentView(R.layout.permission_activity);
-
-        mListView = (ListView) findViewById(R.id.list);
-
-        mContactsButton = (Button) findViewById(R.id.show_contacts);
-        mContactsButton.setOnClickListener(this);
-
-        mEventsButton = (Button) findViewById(R.id.show_events);
-        mEventsButton.setOnClickListener(this);
+        setContentView(foo.bar.permission2.R.layout.permission_activity);
 
-        mPermissionsButton = (Button) findViewById(R.id.request_permissions);
-        mPermissionsButton.setOnClickListener(this);
+        mListView = (ListView) findViewById(foo.bar.permission2.R.id.list);
+        View emptyView = findViewById(foo.bar.permission2.R.id.empty_state);
+        mListView.setEmptyView(emptyView);
 
         mContactsAdapter = new SimpleCursorAdapter(this,
                 android.R.layout.simple_list_item_1,