From c8a1db191207e38b7ad0acdfd276651e4911e812 Mon Sep 17 00:00:00 2001 From: Alexandra Gherghina <alexgherghina@google.com> Date: Thu, 24 Jul 2014 18:54:31 +0100 Subject: Toggle between primary and managed profile in apps settings This adds a spinner to the apps screen which can be used to toggle between the Settings app in the primary and managed profile so that the user can edit settings belonging to both profiles. Bug: 16369104 Change-Id: I09a94c07597e6509de025dfbbe0e454ae3d9b0aa --- res/layout/manage_applications_running.xml | 68 ++++++++++++++++++------------ 1 file changed, 41 insertions(+), 27 deletions(-) (limited to 'res/layout/manage_applications_running.xml') diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml index 352ce442e..cc8c1867e 100644 --- a/res/layout/manage_applications_running.xml +++ b/res/layout/manage_applications_running.xml @@ -14,32 +14,46 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - <view class="com.android.settings.applications.RunningProcessesView" - android:id="@+id/running_processes" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" /> - - <LinearLayout 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/settings_safetylegal_activity_loading" - android:paddingTop="4dip" - android:singleLine="true" /> - - </LinearLayout> - -</FrameLayout> + android:orientation="vertical"> + + <FrameLayout android:id="@+id/pinned_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <view class="com.android.settings.applications.RunningProcessesView" + android:id="@+id/running_processes" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <LinearLayout 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/settings_safetylegal_activity_loading" + android:paddingTop="4dip" + android:singleLine="true" /> + + </LinearLayout> + + </FrameLayout> + +</LinearLayout> -- cgit v1.2.3