Merge "Split app info into several screens" (2cb25ddd) · Commits · e / os / android_packages_apps_Settings

res/layout/app_notification_header.xml→res/layout/app_header.xml

+0 −0

File moved.

res/layout/app_preferred_settings.xml

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 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.
		*/
		-->
		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style">

		<LinearLayout
		android:id="@+id/all_details"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingBottom="5dip"
		android:orientation="vertical">

		<!-- Prefered activities section -->
		<TextView android:id="@+id/auto_launch_title"
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/auto_launch_label" />

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
		<TextView android:id="@+id/auto_launch"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:layout_alignParentStart="true"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dip" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/auto_launch"
		android:paddingTop="4dip"
		android:orientation="horizontal">
		<View
		android:layout_width="120dip"
		android:layout_height="0dip"
		android:layout_weight="0.4" />
		<View
		android:layout_width="0dip"
		android:layout_height="0dip"
		android:visibility="invisible"
		android:layout_weight="0.2" />
		<Button
		android:id="@+id/clear_activities_button"
		android:layout_width="120dip"
		android:layout_height="wrap_content"
		android:layout_weight="0.4"
		android:text="@string/clear_activities" />
		</LinearLayout>
		</RelativeLayout>

		</LinearLayout>
		</ScrollView>

res/layout/installed_app_details.xml

+26 −431

Original line number	Diff line number	Diff line
		@@ -16,20 +16,13 @@
		** limitations under the License.
		*/
		-->
		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style">

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/all_details"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingBottom="5dip"
		android:orientation="vertical">

		<!-- App snippet with buttons -->
		@@ -37,6 +30,8 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:paddingTop="5dip"
		android:paddingBottom="10dip"
		android:orientation="vertical">

		<!-- Application snippet label, version and icon -->
		@@ -44,6 +39,10 @@
		layout="@layout/manage_applications_item"
		android:id="@+id/app_snippet" />

		<Space
		android:layout_width="match_parent"
		android:layout_height="5dp" />

		<!-- Force stop and uninstall buttons -->
		<include
		layout="@layout/two_buttons_panel"
		@@ -54,410 +53,6 @@
		layout="@layout/two_buttons_panel"
		android:id="@+id/more_control_buttons_panel"/>

		<!-- Ban notifications for this package -->
		<CheckBox android:id="@+id/notification_switch"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="start"
		android:layout_marginTop="4dip"
		android:text="@string/app_notifications_switch_label" />

		</LinearLayout>

		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/storage_label" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:paddingTop="-1dip">
		<TextView
		android:id="@+id/total_size_prefix"
		android:text="@string/total_size_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:paddingTop="6dip" />
		<ImageView
		android:id="@+id/info_size_dots"
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/total_size_text"
		android:paddingTop="6dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:paddingTop="-1dip">
		<TextView
		android:id="@+id/application_size_prefix"
		android:text="@string/application_size_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:paddingTop="6dip" />
		<ImageView
		android:id="@+id/info_size_dots"
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/application_size_text"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:paddingTop="-1dip">
		<TextView
		android:id="@+id/external_code_size_prefix"
		android:text="@string/external_code_size_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:paddingTop="6dip" />
		<ImageView
		android:id="@+id/info_size_dots"
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/external_code_size_text"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<LinearLayout
		android:id="@+id/info_size"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:paddingTop="-1dip">
		<TextView
		android:id="@+id/data_size_prefix"
		android:text="@string/data_size_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:paddingTop="6dip" />
		<ImageView
		android:id="@+id/info_size_dots"
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/data_size_text"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:paddingTop="-1dip">
		<TextView
		android:id="@+id/external_data_size_prefix"
		android:text="@string/external_data_size_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:paddingTop="6dip" />
		<ImageView
		android:id="@+id/info_size_dots"
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/external_data_size_text"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<!-- Clear data and install location buttons -->
		<include
		layout="@layout/two_buttons_panel"
		android:id="@+id/data_buttons_panel"/>

		</LinearLayout>

		<!-- Clear cache section -->
		<RelativeLayout
		android:id="@+id/cache_panel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" >
		<TextView
		android:id="@+id/cache_header"
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/cache_header_label" />
		<LinearLayout
		android:id="@+id/cache_size"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="true"
		android:layout_below="@id/cache_header"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="-1dip">
		<TextView
		android:text="@string/cache_size_label"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:gravity="center_vertical" />
		<ImageView
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="1px"
		android:layout_gravity="bottom"
		android:layout_marginStart="1dip"
		android:layout_marginEnd="1dip"
		android:layout_marginBottom="4dip"
		android:scaleType="center"
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/cache_size_text"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingTop="6dip"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/cache_size"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="4dip"
		android:orientation="horizontal">
		<View
		android:layout_width="120dip"
		android:layout_height="0dip"
		android:layout_weight="0.4" />
		<View
		android:layout_width="0dip"
		android:layout_height="0dip"
		android:visibility="invisible"
		android:layout_weight="0.2" />
		<Button
		android:id="@+id/clear_cache_button"
		android:layout_width="120dip"
		android:layout_height="wrap_content"
		android:layout_weight="0.4"
		android:text="@string/clear_cache_btn_text" />
		</LinearLayout>

		</RelativeLayout>

		<!-- Prefered activities section -->
		<TextView android:id="@+id/auto_launch_title"
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/auto_launch_label" />

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
		<TextView android:id="@+id/auto_launch"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:layout_alignParentStart="true"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dip" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/auto_launch"
		android:paddingTop="4dip"
		android:orientation="horizontal">
		<View
		android:layout_width="120dip"
		android:layout_height="0dip"
		android:layout_weight="0.4" />
		<View
		android:layout_width="0dip"
		android:layout_height="0dip"
		android:visibility="invisible"
		android:layout_weight="0.2" />
		<Button
		android:id="@+id/clear_activities_button"
		android:layout_width="120dip"
		android:layout_height="wrap_content"
		android:layout_weight="0.4"
		android:text="@string/clear_activities" />
		</LinearLayout>
		</RelativeLayout>

		<!-- Screen compatibility section -->
		<LinearLayout android:id="@+id/screen_compatibility_section"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">
		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/screen_compatibility_label" />

		<TextView android:textAppearance="?android:attr/textAppearanceSmall"
		android:layout_alignParentStart="true"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dip"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:text="@string/screen_compatibility_text"/>
		<CheckBox android:id="@+id/ask_compatibility_cb"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="12dip"
		android:layout_gravity="start"
		android:text="@string/ask_compatibility" />
		<CheckBox android:id="@+id/enable_compatibility_cb"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="12dip"
		android:layout_gravity="start"
		android:text="@string/enable_compatibility" />
		</LinearLayout>

		<!-- Permissions section -->
		<LinearLayout
		android:id="@+id/permissions_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/permissions_label" />
		<TextView android:id="@+id/security_settings_billing_desc"
		android:text="@string/security_settings_billing_desc"
		android:textColor="#ffffb060"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:paddingTop="6dip"
		android:paddingBottom="6dip"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		<LinearLayout
		android:id="@+id/security_settings_billing_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_premium_sms_desc" />
		<Spinner
		android:id="@+id/security_settings_premium_sms_list"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:spinnerMode="dropdown" />
		</LinearLayout>
		<TextView android:id="@+id/security_settings_desc"
		android:text="@string/security_settings_desc"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:paddingTop="6dip"
		android:paddingBottom="6dip"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		<LinearLayout
		android:id="@+id/security_settings_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"/>
		</LinearLayout>
		</LinearLayout>
		</ScrollView>