Start implementation of new app info storage page
Things are mostly in the right places, may need some minor location
adjustment on everything and styling for the buttons.
Bug: 19511439
Change-Id: If7730285d6ddc36e32cc8bc119885a8e215c0eb5
diff --git a/res/layout/app_cache_settings.xml b/res/layout/app_cache_settings.xml
new file mode 100644
index 0000000..bb57433
--- /dev/null
+++ b/res/layout/app_cache_settings.xml
@@ -0,0 +1,58 @@
+<?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.
+-->
+
+<!-- Clear cache section -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/all_details"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:orientation="vertical">
+
+ <FrameLayout
+ android:id="@+id/cache_size"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dip">
+ <TextView
+ android:text="@string/cache_size_label"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:maxLines="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:textColorPrimary"
+ android:gravity="center_vertical" />
+ <TextView
+ android:id="@+id/cache_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <include
+ android:id="@+id/clear_cache_button"
+ layout="@layout/single_button_panel" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="10dp" />
+
+</LinearLayout>
diff --git a/res/layout/app_storage_settings.xml b/res/layout/app_storage_settings.xml
new file mode 100644
index 0000000..82493f7
--- /dev/null
+++ b/res/layout/app_storage_settings.xml
@@ -0,0 +1,151 @@
+<?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/all_details"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:orientation="vertical">
+
+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/category_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dashboard_category_title_height"
+ android:singleLine="true"
+ android:gravity="center_vertical"
+ android:textAppearance="@style/TextAppearance.CategoryTitle"
+ android:textAlignment="viewStart"
+ android:text="@string/storage_label"
+ />
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="0dip">
+ <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="match_parent"
+ android:textColor="?android:textColorPrimary"
+ android:maxLines="1" />
+ <TextView
+ android:id="@+id/total_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip">
+ <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="match_parent"
+ android:textColor="?android:textColorPrimary"
+ android:maxLines="1" />
+ <TextView
+ android:id="@+id/application_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip">
+ <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="match_parent"
+ android:textColor="?android:textColorPrimary"
+ android:maxLines="1" />
+ <TextView
+ android:id="@+id/external_code_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip">
+ <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="match_parent"
+ android:textColor="?android:textColorPrimary"
+ android:maxLines="1" />
+ <TextView
+ android:id="@+id/data_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip">
+ <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="match_parent"
+ android:textColor="?android:textColorPrimary"
+ android:maxLines="1" />
+ <TextView
+ android:id="@+id/external_data_size_text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="right"
+ android:maxLines="1" />
+ </FrameLayout>
+
+ <include
+ android:id="@+id/clear_data_button"
+ layout="@layout/single_button_panel" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="10dp" />
+
+</LinearLayout>
diff --git a/res/layout/single_button_panel.xml b/res/layout/single_button_panel.xml
new file mode 100755
index 0000000..5f1fee9
--- /dev/null
+++ b/res/layout/single_button_panel.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!--
+ Defines a panel with one button in the same layout as the two button layout.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="bottom"
+ android:paddingTop="4dip"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/button"
+ android:layout_width="120dip"
+ android:layout_weight="0.4"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical" />
+ <Space
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.2" />
+ <Space
+ android:layout_width="120dip"
+ android:layout_weight="0.4"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+</LinearLayout>
diff --git a/res/layout/storage_settings.xml b/res/layout/storage_settings.xml
deleted file mode 100644
index a73cf4c..0000000
--- a/res/layout/storage_settings.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?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.
--->
-
-<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">
-
-
- <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>
- </LinearLayout>
-</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 14670a7..f4edc7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6053,15 +6053,18 @@
<string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal storage">%2$s</xliff:g></string>
<!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
- <string name="storage_type_internal">internal storage</string>
+ <string name="storage_type_internal">Internal storage</string>
<!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
- <string name="storage_type_external">external storage</string>
+ <string name="storage_type_external">External storage</string>
<!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
<string name="app_data_usage">App data usage</string>
<!-- Summary for data usage preference [CHAR LIMIT=15] -->
<string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
+ <!-- Title of storage preference to control where app is stored -->
+ <string name="storage_used">Storage used</string>
+
<!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
<string name="notifications_enabled">On</string>
<!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
new file mode 100644
index 0000000..6baaae1
--- /dev/null
+++ b/res/xml/app_storage_settings.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/application_info_label">
+
+ <com.android.settings.DropDownPreference
+ android:key="app_location_setting"
+ android:title="@string/storage_used"
+ android:summary="@string/storage_type_internal"
+ android:selectable="true" />
+
+ <com.android.settings.applications.LayoutPreference
+ android:key="storage_settings"
+ android:layout="@layout/app_storage_settings" />
+
+ <com.android.settings.applications.LayoutPreference
+ android:key="cache_settings"
+ android:layout="@layout/app_cache_settings" />
+
+</PreferenceScreen>
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index cb923c8..0134c6f 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -19,7 +19,7 @@
android:key="battery_saver">
<!-- Turn on automatically -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="turn_on_automatically"
android:title="@string/battery_saver_turn_on_automatically_title"
android:persistent="false" />
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index db650f3..70dcb9a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -81,7 +81,7 @@
android:entryValues="@array/entryvalues_font_size"
android:dialogTitle="@string/dialog_title_font_size" />
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="auto_rotate"
android:title="@string/display_auto_rotate_title" />
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
index 2f72f5d..09f5bb3 100644
--- a/res/xml/installed_app_details.xml
+++ b/res/xml/installed_app_details.xml
@@ -16,7 +16,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/application_info_label">
- <com.android.settings.applications.HeaderPreference
+ <com.android.settings.applications.LayoutPreference
android:key="header_view"
android:layout="@layout/installed_app_details" />
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index 6e62f83..ac61b00 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -105,7 +105,7 @@
android:persistent="false" />
<!-- When device is locked -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title"
android:persistent="false" />
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index 08679db..88c4130 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -60,13 +60,13 @@
android:persistent="false" />
<!-- Dock speaker plays -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="dock_audio_media"
android:title="@string/dock_audio_media_title"
android:persistent="false" />
<!-- Emergency tone -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="emergency_tone"
android:title="@string/emergency_tone_title"
android:persistent="false" />
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 7514565..3ac4eef 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -20,7 +20,7 @@
android:title="@string/zen_mode_settings_title" >
<!-- When calls and notifications arrive -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="zen_mode"
android:title="@string/zen_mode_option_title"
android:persistent="false" />
@@ -50,7 +50,7 @@
android:switchTextOff=""
android:switchTextOn="" />
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="starred"
android:title="@string/zen_mode_from"
android:persistent="false" />
@@ -79,7 +79,7 @@
<!-- Start time/End time added and removed here! :-) -->
<!-- Interruptions allowed -->
- <com.android.settings.notification.DropDownPreference
+ <com.android.settings.DropDownPreference
android:key="downtime_mode"
android:title="@string/zen_mode_downtime_mode_title"
android:order="100"
@@ -103,4 +103,4 @@
</PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>