Add loading screens to permissions

Styled the same way as in settings.

Bug: 22234767
Change-Id: If21d71b132e5f0e69b65109c479162f03116dab8

3 files changed, 56 insertions, 9 deletions

diff --git a/res/layout/loading_container.xml b/res/layout/loading_container.xml
new file mode 100644
index 00000000..5a165dee
--- /dev/null
+++ b/res/layout/loading_container.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading_container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:gravity="center">
+
+    <ProgressBar style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/loading"
+        android:paddingTop="4dip"
+        android:singleLine="true" />
+
+</LinearLayout>
diff --git a/res/layout/permissions_frame.xml b/res/layout/permissions_frame.xml
index 0c70fe75..5e0d9ec1 100644
--- a/res/layout/permissions_frame.xml
+++ b/res/layout/permissions_frame.xml
@@ -16,18 +16,26 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/prefs_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true">
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/no_permissions"
+    <FrameLayout
+        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="@string/no_permissions"
-        android:gravity="center"
-        android:textAppearance="@android:style/TextAppearance.Large"
-        />
+        android:filterTouchesWhenObscured="true">
+
+        <TextView
+            android:id="@+id/no_permissions"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/no_permissions"
+            android:gravity="center"
+            android:textAppearance="@android:style/TextAppearance.Large"
+            />
+
+    </FrameLayout>
+
+    <include layout="@layout/loading_container" />
 
 </FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f71dfe99..2e23df01 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -253,4 +253,7 @@
    <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
    <string name="permission_summary_enforced_by_policy">Enforced by policy</string>
 
+   <!-- Text displayed until loading is done -->
+   <string name="loading">Loading\u2026</string>
+
 </resources>