commit 30d8b9175bb058642f989df9e13d1cc8af8b03c9
author Christofer Åkersten <akersten@google.com> Thu Mar 07 11:25:16 2019 -0800
committer Christofer Åkersten <akersten@google.com> Thu Mar 14 16:42:38 2019 -0700
tree 8cb44d93bc80cb758d7eddc9807c1257df0ea9b9
parent 7a71ffd987d2fa8762ebd11f7ed397ea72719f2c

Show permission request for all tabs

Bug: 123328776
Test: manual
Change-Id: I1dbd76b958108eeb2a5447d5dd67c1e8d192c06c

java/com/android/pump/activity/PumpActivity.java

diff --git a/java/com/android/pump/activity/PumpActivity.java b/java/com/android/pump/activity/PumpActivity.java
index cd06d9c..e8d4ceb 100644
--- a/java/com/android/pump/activity/PumpActivity.java
+++ b/java/com/android/pump/activity/PumpActivity.java
@@ -60,7 +60,7 @@
 
     private static final Pages[] PAGES_LIST = {
         new Pages(R.id.menu_home, new Page[] {
-            new PermissionPage(HomeFragment::newInstance, "Home")
+            new Page(HomeFragment::newInstance, "Home")
         }),
         new Pages(R.id.menu_video, new Page[] {
             new Page(MovieFragment::newInstance, "Movies"),
@@ -220,7 +220,7 @@
     }
 
     private static class Page {
-        private static int sId;
+        private static int sId = 0;
 
         private final int mId;
         private final PageCreator mPageCreator;
@@ -233,16 +233,26 @@
         }
 
         int getId() {
+            if (isMissingPermissions()) {
+                return ~mId;
+            }
             return mId;
         }
 
         @NonNull Fragment createFragment() {
+            if (isMissingPermissions()) {
+                return PermissionFragment.newInstance();
+            }
             return mPageCreator.newInstance();
         }
 
         @NonNull String getTitle() {
             return mTitle;
         }
+
+        private boolean isMissingPermissions() {
+            return sIsMissingPermissions;
+        }
     }
 
     private static class Pages {
@@ -273,32 +283,6 @@
         }
     }
 
-    private static class PermissionPage extends Page {
-        PermissionPage(@NonNull PageCreator pageCreator, @NonNull String title) {
-            super(pageCreator, title);
-        }
-
-        @Override
-        int getId() {
-            if (isMissingPermissions()) {
-                return ~super.getId();
-            }
-            return super.getId();
-        }
-
-        @Override
-        @NonNull Fragment createFragment() {
-            if (isMissingPermissions()) {
-                return PermissionFragment.newInstance();
-            }
-            return super.createFragment();
-        }
-
-        private boolean isMissingPermissions() {
-            return sIsMissingPermissions;
-        }
-    }
-
     @FunctionalInterface
     private interface PageCreator {
         @NonNull Fragment newInstance();