Merge Theme.Micro and Theme.Material.
Bug: 29248638
Change-Id: I1f6a419de89f89e4a105e244c6495e2df29c120c
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/drawable-watch/dialog_background_material.xml
similarity index 76%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/drawable-watch/dialog_background_material.xml
index 8dbc905..de52f08 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/drawable-watch/dialog_background_material.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
-</resources>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+ <solid android:color="?attr/colorBackground" />
+</shape>
diff --git a/core/res/res/layout-notround/alert_dialog_header_micro.xml b/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml
similarity index 100%
rename from core/res/res/layout-notround/alert_dialog_header_micro.xml
rename to core/res/res/layout-notround-watch/alert_dialog_header_micro.xml
diff --git a/core/res/res/layout-round/alert_dialog_header_micro.xml b/core/res/res/layout-round-watch/alert_dialog_header_micro.xml
similarity index 100%
rename from core/res/res/layout-round/alert_dialog_header_micro.xml
rename to core/res/res/layout-round-watch/alert_dialog_header_micro.xml
diff --git a/core/res/res/layout/alert_dialog_micro.xml b/core/res/res/layout-watch/alert_dialog_material.xml
similarity index 83%
rename from core/res/res/layout/alert_dialog_micro.xml
rename to core/res/res/layout-watch/alert_dialog_material.xml
index 04f8a2a..e627d42 100644
--- a/core/res/res/layout/alert_dialog_micro.xml
+++ b/core/res/res/layout-watch/alert_dialog_material.xml
@@ -29,8 +29,8 @@
android:layout_height="wrap_content">
<!-- Top Panel -->
<FrameLayout
- android:paddingLeft="@dimen/dialog_padding_micro"
- android:paddingRight="@dimen/dialog_padding_micro"
+ android:paddingLeft="?dialogPreferredPadding"
+ android:paddingRight="?dialogPreferredPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/topPanel">
@@ -48,9 +48,9 @@
<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Micro.AlertDialog.Message"
- android:paddingStart="@dimen/dialog_padding_micro"
- android:paddingEnd="@dimen/dialog_padding_micro"
+ android:textAppearance="@style/TextAppearance.Material.Body1"
+ android:paddingStart="?dialogPreferredPadding"
+ android:paddingEnd="?dialogPreferredPadding"
android:paddingTop="8dip"
android:paddingBottom="8dip"/>
</FrameLayout>
@@ -78,31 +78,31 @@
android:dividerPadding="0dip"
android:orientation="vertical"
android:minHeight="@dimen/alert_dialog_button_bar_height"
- android:paddingBottom="@dimen/dialog_padding_micro"
+ android:paddingBottom="?dialogPreferredPadding"
style="?android:attr/buttonBarStyle"
android:layoutDirection="locale"
android:measureWithLargestChild="true">
<Button android:id="@+id/button1"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="@dimen/dialog_padding_micro"
- android:layout_marginRight="@dimen/dialog_padding_micro"
+ android:layout_marginLeft="?dialogPreferredPadding"
+ android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button android:id="@+id/button3"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="@dimen/dialog_padding_micro"
- android:layout_marginRight="@dimen/dialog_padding_micro"
+ android:layout_marginLeft="?dialogPreferredPadding"
+ android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button android:id="@+id/button2"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="@dimen/dialog_padding_micro"
- android:layout_marginRight="@dimen/dialog_padding_micro"
+ android:layout_marginLeft="?dialogPreferredPadding"
+ android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/core/res/res/layout/number_picker_with_selector_wheel_micro.xml b/core/res/res/layout-watch/number_picker_material.xml
similarity index 100%
rename from core/res/res/layout/number_picker_with_selector_wheel_micro.xml
rename to core/res/res/layout-watch/number_picker_material.xml
diff --git a/core/res/res/layout/preference_micro.xml b/core/res/res/layout-watch/preference_material.xml
similarity index 100%
rename from core/res/res/layout/preference_micro.xml
rename to core/res/res/layout-watch/preference_material.xml
diff --git a/core/res/res/values-watch/dimens.xml b/core/res/res/values-notround-watch/dimens.xml
similarity index 100%
rename from core/res/res/values-watch/dimens.xml
rename to core/res/res/values-notround-watch/dimens.xml
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-notround-watch/dimens_material.xml
similarity index 67%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/values-notround-watch/dimens_material.xml
index 8dbc905..b02437b 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-notround-watch/dimens_material.xml
@@ -14,7 +14,10 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+ <dimen name="dialog_padding_material">8dp</dimen>
+ <dimen name="preference_fragment_padding_vertical_material">0dp</dimen>
+
+ <dimen name="list_item_padding_horizontal_material">16dp</dimen>
+ <dimen name="list_item_padding_start_material">16dp</dimen>
+ <dimen name="list_item_padding_end_material">16dp</dimen>
</resources>
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-notround-watch/styles_material.xml
similarity index 75%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/values-notround-watch/styles_material.xml
index 8dbc905..cd8521f4 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-notround-watch/styles_material.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,5 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+ <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1"/>
</resources>
diff --git a/core/res/res/values-notround/dimens_micro.xml b/core/res/res/values-notround/dimens_micro.xml
deleted file mode 100644
index 51291d9..0000000
--- a/core/res/res/values-notround/dimens_micro.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<resources>
- <dimen name="dialog_padding_micro">8dp</dimen>
- <dimen name="list_item_padding_left_micro">16dp</dimen>
- <dimen name="list_item_padding_right_micro">16dp</dimen>
-</resources>
diff --git a/core/res/res/values-notround/styles_micro.xml b/core/res/res/values-notround/styles_micro.xml
deleted file mode 100644
index 1294660..0000000
--- a/core/res/res/values-notround/styles_micro.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<resources>
- <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">
- <item name="textAlignment">viewStart</item>
- </style>
- <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material"/>
- <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material"/>
-</resources>
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-round-watch/config_material.xml
similarity index 66%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/values-round-watch/config_material.xml
index 8dbc905..bf445ef 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-round-watch/config_material.xml
@@ -13,8 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+
+<!-- These resources are around just to allow their values to be customized
+ for watch products. Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Don't clip on round screens so the list can scroll past the rounded edges. -->
+ <bool name="config_preferenceFragmentClipToPadding">false</bool>
</resources>
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-round-watch/dimens_material.xml
similarity index 67%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/values-round-watch/dimens_material.xml
index 8dbc905..a417d19 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-round-watch/dimens_material.xml
@@ -14,7 +14,10 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+ <dimen name="dialog_padding_material">32dp</dimen>
+ <dimen name="preference_fragment_padding_vertical_material">22dp</dimen>
+
+ <dimen name="list_item_padding_horizontal_material">32dp</dimen>
+ <dimen name="list_item_padding_start_material">40dp</dimen>
+ <dimen name="list_item_padding_end_material">24dp</dimen>
</resources>
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-round-watch/styles_material.xml
similarity index 75%
copy from core/res/res/values-round/dimens_micro.xml
copy to core/res/res/values-round-watch/styles_material.xml
index 8dbc905..a2f3c02 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-round-watch/styles_material.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+ <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1">
+ <item name="textAlignment">center</item>
+ </style>
</resources>
diff --git a/core/res/res/values-round/styles_micro.xml b/core/res/res/values-round/styles_micro.xml
deleted file mode 100644
index f19adde..0000000
--- a/core/res/res/values-round/styles_micro.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<resources>
- <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">
- <item name="textAlignment">center</item>
- </style>
- <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material">
- <item name="paddingTop">22dp</item>
- <item name="paddingBottom">22dp</item>
- <item name="clipToPadding">false</item>
- </style>
- <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material">
- <item name="paddingTop">22dp</item>
- <item name="paddingBottom">22dp</item>
- </style>
-</resources>
diff --git a/core/res/res/values/colors_micro.xml b/core/res/res/values-watch/colors_material.xml
similarity index 64%
rename from core/res/res/values/colors_micro.xml
rename to core/res/res/values-watch/colors_material.xml
index b268e9a..cbdf879 100644
--- a/core/res/res/values/colors_micro.xml
+++ b/core/res/res/values-watch/colors_material.xml
@@ -14,21 +14,14 @@
limitations under the License.
-->
<resources>
- <color name="foreground_micro_dark">@color/white</color>
- <color name="foreground_micro_light">@color/black</color>
+ <color name="background_material_dark">@color/micro_blue_grey_b15</color>
+ <color name="background_floating_material_dark">@color/micro_blue_grey_b30</color>
- <color name="background_micro_dark">@color/micro_blue_grey_b15</color>
- <color name="background_micro_light">@color/white</color>
- <color name="background_floating_micro_dark">@color/micro_blue_grey_b30</color>
- <color name="background_floating_micro_light">@color/micro_blue_grey_500</color>
+ <color name="primary_material_dark">@color/micro_blue_grey_b65</color>
+ <color name="primary_dark_material_dark">@color/micro_blue_grey_b40</color>
- <color name="primary_micro_dark">@color/micro_blue_grey_b65</color>
- <color name="primary_dark_micro_dark">@color/micro_blue_grey_b40</color>
-
- <color name="accent_micro_light">@color/micro_blue_grey_500</color>
- <color name="accent_micro_dark">@color/micro_blue_grey_b100</color>
-
- <color name="button_micro_dark">@color/micro_button_gray</color>
+ <color name="accent_material_dark">@color/micro_blue_grey_b100</color>
+ <color name="accent_material_light">@color/micro_blue_grey_500</color>
<!-- Primary & accent colors -->
<eat-comment />
diff --git a/core/res/res/values-watch/config_material.xml b/core/res/res/values-watch/config_material.xml
new file mode 100644
index 0000000..951c088
--- /dev/null
+++ b/core/res/res/values-watch/config_material.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for watch products. Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Watch type devices have limited screen real-estate, and thus action bars should not be
+ used. -->
+ <bool name="config_windowActionBarSupported">false</bool>
+
+ <!-- Watch type devices have limited screen real-estate, and thus titles should not be used. -->
+ <bool name="config_windowNoTitleDefault">true</bool>
+
+ <!-- Use micro alert controller -->
+ <integer name="config_alertDialogController">1</integer>
+
+ <!-- Dialog windows in watch should occupy the whole screen and not be floating. -->
+ <bool name="config_dialogWindowIsFloating">false</bool>
+
+ <!-- Always overscan by default to ensure onApplyWindowInsets will always be called. -->
+ <bool name="config_windowOverscanByDefault">true</bool>
+
+ <!-- Due to the smaller screen size, have dialog titles occupy more than 1 line. -->
+ <integer name="config_dialogWindowTitleMaxLines">3</integer>
+</resources>
diff --git a/core/res/res/values-round/dimens_micro.xml b/core/res/res/values-watch/dimens_material.xml
similarity index 79%
rename from core/res/res/values-round/dimens_micro.xml
rename to core/res/res/values-watch/dimens_material.xml
index 8dbc905..d579434 100644
--- a/core/res/res/values-round/dimens_micro.xml
+++ b/core/res/res/values-watch/dimens_material.xml
@@ -14,7 +14,5 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_micro">32dp</dimen>
- <dimen name="list_item_padding_left_micro">40dp</dimen>
- <dimen name="list_item_padding_right_micro">24dp</dimen>
+ <item name="text_line_spacing_multiplier_material" format="float" type="dimen">1.2</item>
</resources>
diff --git a/core/res/res/values-watch/donottranslate_material.xml b/core/res/res/values-watch/donottranslate_material.xml
new file mode 100644
index 0000000..a6f2ff4
--- /dev/null
+++ b/core/res/res/values-watch/donottranslate_material.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<resources>
+ <string name="font_family_display_4_material">sans-serif-condensed-light</string>
+ <string name="font_family_display_3_material">sans-serif-condensed-light</string>
+ <string name="font_family_display_2_material">sans-serif-condensed-light</string>
+ <string name="font_family_display_1_material">sans-serif-condensed-light</string>
+ <string name="font_family_headline_material">sans-serif-condensed-light</string>
+ <string name="font_family_title_material">sans-serif-condensed</string>
+ <string name="font_family_subhead_material">sans-serif-condensed-light</string>
+ <string name="font_family_menu_material">sans-serif-condensed-light</string>
+ <string name="font_family_body_2_material">sans-serif-condensed</string>
+ <string name="font_family_body_1_material">sans-serif-condensed-light</string>
+ <string name="font_family_caption_material">sans-serif-condensed-light</string>
+ <string name="font_family_button_material">sans-serif-condensed</string>
+ </resources>
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
new file mode 100644
index 0000000..c98f63d
--- /dev/null
+++ b/core/res/res/values-watch/styles_material.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!--
+===============================================================
+ PLEASE READ
+===============================================================
+
+The Material themes must not be modified in order to pass CTS.
+Many related themes and styles depend on other values defined in this file.
+If you would like to provide custom themes and styles for your device,
+please see styles_device_defaults.xml.
+
+===============================================================
+ PLEASE READ
+===============================================================
+ -->
+<resources>
+ <style name="Animation.Material.Activity" parent="Animation.Activity">
+ <item name="activityOpenEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="activityOpenRemoteViewsEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="activityOpenExitAnimation">@anim/slide_in_exit_micro</item>
+ <item name="activityCloseEnterAnimation">@null</item>
+ <item name="activityCloseExitAnimation">@anim/slide_out_micro</item>
+ <item name="taskOpenEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="taskOpenExitAnimation">@anim/slide_in_exit_micro</item>
+ <item name="taskCloseEnterAnimation">@null</item>
+ <item name="taskCloseExitAnimation">@anim/slide_out_micro</item>
+ <item name="taskToFrontEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="taskToFrontExitAnimation">@anim/slide_in_exit_micro</item>
+ <item name="taskToBackEnterAnimation">@null</item>
+ <item name="taskToBackExitAnimation">@anim/slide_out_micro</item>
+ <item name="wallpaperOpenEnterAnimation">@null</item>
+ <item name="wallpaperOpenExitAnimation">@anim/slide_out_micro</item>
+ <item name="wallpaperCloseEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="wallpaperCloseExitAnimation">@anim/slide_in_exit_micro</item>
+ <item name="wallpaperIntraOpenEnterAnimation">@null</item>
+ <item name="wallpaperIntraOpenExitAnimation">@anim/slide_out_micro</item>
+ <item name="wallpaperIntraCloseEnterAnimation">@anim/slide_in_enter_micro</item>
+ <item name="wallpaperIntraCloseExitAnimation">@anim/slide_in_exit_micro</item>
+ </style>
+
+ <style name="Widget.Material.TextView" parent="Widget.TextView">
+ <item name="breakStrategy">balanced</item>
+ </style>
+
+ <!-- Alert dialog button bar button -->
+ <style name="Widget.Material.Button.ButtonBar.AlertDialog" parent="Widget.Material.Button.Borderless.Small">
+ <item name="gravity">center_vertical|left</item>
+ <item name="minWidth">64dp</item>
+ <item name="minHeight">@dimen/alert_dialog_button_bar_height</item>
+ </style>
+
+ <style name="Widget.Material.NumberPicker" parent="Widget.NumberPicker">
+ <item name="internalLayout">@layout/number_picker_material</item>
+ <item name="solidColor">@color/transparent</item>
+ <item name="selectionDivider">@drawable/numberpicker_selection_divider</item>
+ <item name="selectionDividerHeight">2dp</item>
+ <item name="selectionDividersDistance">48dp</item>
+ <item name="internalMinWidth">64dp</item>
+ <item name="internalMaxHeight">180dp</item>
+ <item name="virtualButtonPressedDrawable">?selectableItemBackground</item>
+ <item name="descendantFocusability">blocksDescendants</item>
+ </style>
+</resources>
diff --git a/core/res/res/values-watch/themes.xml b/core/res/res/values-watch/themes.xml
index 6d6065f..04df180 100644
--- a/core/res/res/values-watch/themes.xml
+++ b/core/res/res/values-watch/themes.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
@@ -14,11 +14,10 @@
limitations under the License.
-->
<resources>
- <style name="Theme.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.Dialog.AppError" parent="Theme.Micro.Dialog.AppError" />
- <style name="Theme.Holo.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.InputMethod" parent="Theme.Micro.InputMethod" />
- <style name="Theme.Material.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
+ <!-- Theme for the dialog shown when an app crashes or ANRs. Override to make it dark. -->
+ <style name="Theme.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert">
+ <item name="windowContentTransitions">false</item>
+ <item name="windowActivityTransitions">false</item>
+ <item name="windowCloseOnTouchOutside">false</item>
+ </style>
</resources>
diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml
index 66509fb..879e02e 100644
--- a/core/res/res/values-watch/themes_device_defaults.xml
+++ b/core/res/res/values-watch/themes_device_defaults.xml
@@ -13,22 +13,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <style name="Theme.DeviceDefault" parent="Theme.Micro" />
- <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Micro" />
- <style name="Theme.DeviceDefault.Dialog" parent="Theme.Micro.Dialog" />
- <style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Micro.Dialog" />
- <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.DeviceDefault.InputMethod" parent="Theme.Micro.InputMethod" />
- <style name="Theme.DeviceDefault.Panel" parent="Theme.Micro.Panel" />
- <style name="Theme.DeviceDefault.Light" parent="Theme.Micro.Light" />
- <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Micro.Light" />
- <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Micro.Light" />
- <style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Micro.Dialog" />
- <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="Theme.Micro.Dialog" />
- <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
- <style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Micro.Light.Panel" />
- <style name="Theme.DeviceDefault.Settings" parent="Theme.Micro" />
- <style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Micro" />
-</resources>
+<!--
+===============================================================
+ PLEASE READ
+===============================================================
+This file contains the themes that are the Device Defaults.
+If you want to edit themes to skin your device, do it here.
+We recommend that you do not edit themes.xml and instead edit
+this file.
+
+Editing this file instead of themes.xml will greatly simplify
+merges for future platform versions and CTS compliance will be
+easier.
+===============================================================
+ PLEASE READ
+===============================================================
+ -->
+<resources>
+ <!-- Theme used for the intent picker activity. -->
+ <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material">
+ <item name="colorControlActivated">?attr/colorControlHighlight</item>
+ <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
+ </style>
+
+</resources>
diff --git a/core/res/res/values-watch/themes_material.xml b/core/res/res/values-watch/themes_material.xml
new file mode 100644
index 0000000..e2dae42
--- /dev/null
+++ b/core/res/res/values-watch/themes_material.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!--
+===============================================================
+ PLEASE READ
+===============================================================
+
+The Material themes must not be modified in order to pass CTS.
+Many related themes and styles depend on other values defined in this file.
+If you would like to provide custom themes and styles for your device,
+please see styles_device_defaults.xml.
+
+===============================================================
+ PLEASE READ
+===============================================================
+ -->
+<resources>
+ <!-- Default theme for material style input methods, which is used by the
+ {@link android.inputmethodservice.InputMethodService} class.
+ this inherits from Theme.Panel, but sets up IME appropriate animations
+ and a few custom attributes. -->
+ <style name="Theme.Material.InputMethod" parent="Theme.Material.Panel">
+ <item name="windowAnimationStyle">@style/Animation.InputMethod</item>
+ <item name="imeFullscreenBackground">?colorBackground</item>
+ <item name="imeExtractEnterAnimation">@anim/input_method_extract_enter</item>
+ <item name="imeExtractExitAnimation">@anim/input_method_extract_exit</item>
+ </style>
+</resources>
diff --git a/core/res/res/values/config_material.xml b/core/res/res/values/config_material.xml
new file mode 100644
index 0000000..f62678a
--- /dev/null
+++ b/core/res/res/values/config_material.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds, only for Material theme. Do not translate.
+
+ NOTE: The naming convention is "config_camelCaseValue". -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- True if the device supports action bars. -->
+ <bool name="config_windowActionBarSupported">true</bool>
+
+ <!-- True if the device should have titles by default. -->
+ <bool name="config_windowNoTitleDefault">false</bool>
+
+ <!-- The alert controller to use for alert dialogs. -->
+ <integer name="config_alertDialogController">0</integer>
+
+ <!-- True if dialog windows are floating. -->
+ <bool name="config_dialogWindowIsFloating">true</bool>
+
+ <!-- True if windowOverscan should be on by default. -->
+ <bool name="config_windowOverscanByDefault">false</bool>
+
+ <!-- Max number of lines for the dialog title. -->
+ <integer name="config_dialogWindowTitleMaxLines">1</integer>
+
+ <!-- True if preference fragment should clip to padding. -->
+ <bool name="config_preferenceFragmentClipToPadding">true</bool>
+</resources>
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index 00e48a0..f96cef9 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -24,6 +24,8 @@
<!-- Preference fragment padding, sides -->
<dimen name="preference_fragment_padding_side_material">0dp</dimen>
+ <!-- Preference fragment padding, vertical -->
+ <dimen name="preference_fragment_padding_vertical_material">0dp</dimen>
<!-- Preference breadcrumbs padding, start padding -->
<dimen name="preference_breadcrumbs_padding_start_material">12dp</dimen>
@@ -53,6 +55,8 @@
<!-- Default padding for list items. This should match the action bar
content inset so that ListActivity items line up correctly. -->
<dimen name="list_item_padding_horizontal_material">@dimen/action_bar_content_inset_material</dimen>
+ <dimen name="list_item_padding_start_material">@dimen/action_bar_content_inset_material</dimen>
+ <dimen name="list_item_padding_end_material">@dimen/action_bar_content_inset_material</dimen>
<!-- Padding to add to the start of the overflow action button. -->
<dimen name="action_bar_overflow_padding_start_material">6dp</dimen>
@@ -84,6 +88,8 @@
<dimen name="text_size_medium_material">18sp</dimen>
<dimen name="text_size_small_material">14sp</dimen>
+ <item name="text_line_spacing_multiplier_material" format="float" type="dimen">1.0</item>
+
<dimen name="text_edit_floating_toolbar_elevation">2dp</dimen>
<dimen name="text_edit_floating_toolbar_margin">20dp</dimen>
diff --git a/core/res/res/values/dimens_micro.xml b/core/res/res/values/dimens_micro.xml
deleted file mode 100644
index 75bbdec..0000000
--- a/core/res/res/values/dimens_micro.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<resources>
- <dimen name="text_size_headline_micro">22sp</dimen>
- <dimen name="text_size_title_micro">20sp</dimen>
- <dimen name="text_size_subtitle_micro">18sp</dimen>
- <dimen name="text_size_body_1_micro">16sp</dimen>
- <dimen name="text_size_body_2_micro">14sp</dimen>
- <dimen name="text_size_caption_micro">12sp</dimen>
-
- <dimen name="text_size_large_micro">20sp</dimen>
- <dimen name="text_size_medium_micro">18sp</dimen>
- <dimen name="text_size_small_micro">16sp</dimen>
-
- <item name="line_spacing_multiplier_micro" format="float" type="dimen">1.2</item>
-</resources>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index bb07834..6e0ad36 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -40,7 +40,10 @@
<item name="layout">@layout/preference_list_fragment_material</item>
<item name="paddingStart">@dimen/preference_fragment_padding_side_material</item>
<item name="paddingEnd">@dimen/preference_fragment_padding_side_material</item>
+ <item name="paddingTop">@dimen/preference_fragment_padding_vertical_material</item>
+ <item name="paddingBottom">@dimen/preference_fragment_padding_vertical_material</item>
<item name="divider">?attr/listDivider</item>
+ <item name="clipToPadding">@bool/config_preferenceFragmentClipToPadding</item>
</style>
<style name="PreferenceActivity.Material">
@@ -134,6 +137,8 @@
<style name="PreferenceFragmentList.Material">
<item name="paddingStart">@dimen/preference_fragment_padding_side_material</item>
<item name="paddingEnd">@dimen/preference_fragment_padding_side_material</item>
+ <item name="paddingTop">@dimen/preference_fragment_padding_vertical_material</item>
+ <item name="paddingBottom">@dimen/preference_fragment_padding_vertical_material</item>
</style>
<!-- Begin Material theme styles -->
@@ -147,6 +152,7 @@
<item name="textColorLink">?attr/textColorLink</item>
<item name="textSize">@dimen/text_size_body_1_material</item>
<item name="fontFamily">@string/font_family_body_1_material</item>
+ <item name="lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
</style>
<style name="TextAppearance.Material.Display4">
@@ -1190,6 +1196,7 @@
<item name="listItemLayout">@layout/select_dialog_item_material</item>
<item name="multiChoiceItemLayout">@layout/select_dialog_multichoice_material</item>
<item name="singleChoiceItemLayout">@layout/select_dialog_singlechoice_material</item>
+ <item name="controllerType">@integer/config_alertDialogController</item>
</style>
<style name="AlertDialog.Material.Light" />
@@ -1224,7 +1231,7 @@
<style name="DialogWindowTitleBackground.Material.Light" />
<style name="DialogWindowTitle.Material">
- <item name="maxLines">1</item>
+ <item name="maxLines">@integer/config_dialogWindowTitleMaxLines</item>
<item name="scrollHorizontally">true</item>
<item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
</style>
diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml
deleted file mode 100644
index 75f602b..0000000
--- a/core/res/res/values/styles_micro.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<resources>
- <!-- Preference styles -->
- <eat-comment/>
- <style name="Preference.Micro" parent="Preference.Material">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.CheckBoxPreference" parent="Preference.Material.CheckBoxPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.SwitchPreference" parent="Preference.Material.SwitchPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.PreferenceScreen" parent="Preference.Material.PreferenceScreen">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.DialogPreference" parent="Preference.Material.DialogPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.DialogPreference.YesNoPreference" parent="Preference.Material.DialogPreference.YesNoPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.DialogPreference.SeekBarPreference" parent="Preference.Material.DialogPreference.SeekBarPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.DialogPreference.EditTextPreference" parent="Preference.Material.DialogPreference.EditTextPreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
- <style name="Preference.Micro.RingtonePreference" parent="Preference.Material.RingtonePreference">
- <item name="layout">@layout/preference_micro</item>
- </style>
-
- <style name="Animation.Micro"/>
-
- <style name="Animation.Micro.Activity" parent="Animation.Material.Activity">
- <item name="activityOpenEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="activityOpenRemoteViewsEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="activityOpenExitAnimation">@anim/slide_in_exit_micro</item>
- <item name="activityCloseEnterAnimation">@null</item>
- <item name="activityCloseExitAnimation">@anim/slide_out_micro</item>
- <item name="taskOpenEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="taskOpenExitAnimation">@anim/slide_in_exit_micro</item>
- <item name="taskCloseEnterAnimation">@null</item>
- <item name="taskCloseExitAnimation">@anim/slide_out_micro</item>
- <item name="taskToFrontEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="taskToFrontExitAnimation">@anim/slide_in_exit_micro</item>
- <item name="taskToBackEnterAnimation">@null</item>
- <item name="taskToBackExitAnimation">@anim/slide_out_micro</item>
- <item name="wallpaperOpenEnterAnimation">@null</item>
- <item name="wallpaperOpenExitAnimation">@anim/slide_out_micro</item>
- <item name="wallpaperCloseEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="wallpaperCloseExitAnimation">@anim/slide_in_exit_micro</item>
- <item name="wallpaperIntraOpenEnterAnimation">@null</item>
- <item name="wallpaperIntraOpenExitAnimation">@anim/slide_out_micro</item>
- <item name="wallpaperIntraCloseEnterAnimation">@anim/slide_in_enter_micro</item>
- <item name="wallpaperIntraCloseExitAnimation">@anim/slide_in_exit_micro</item>
- </style>
-
- <style name="AlertDialog.Micro" parent="AlertDialog.Material">
- <item name="fullDark">@null</item>
- <item name="topDark">@null</item>
- <item name="centerDark">@null</item>
- <item name="bottomDark">@null</item>
- <item name="fullBright">@null</item>
- <item name="topBright">@null</item>
- <item name="centerBright">@null</item>
- <item name="bottomBright">@null</item>
- <item name="bottomMedium">@null</item>
- <item name="centerMedium">@null</item>
- <item name="layout">@layout/alert_dialog_micro</item>
- <item name="controllerType">micro</item>
- </style>
-
- <style name="DialogWindowTitle.Micro">
- <item name="scrollHorizontally">true</item>
- <item name="textAppearance">@style/TextAppearance.Micro.DialogWindowTitle</item>
- <item name="textAlignment">viewStart</item>
- </style>
-
- <style name="TextAppearance.Micro" parent="TextAppearance.Material">
- <item name="fontFamily">sans-serif-condensed-light</item>
- <item name="lineSpacingMultiplier">@dimen/line_spacing_multiplier_micro</item>
- <item name="textColor">?attr/textColorPrimary</item>
- <item name="textSize">@dimen/text_size_medium_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Inverse" parent="TextAppearance.Material">
- <item name="textColor">?attr/textColorPrimaryInverse</item>
- <item name="textColorHint">?attr/textColorHintInverse</item>
- <item name="textColorHighlight">?attr/textColorHighlightInverse</item>
- <item name="textColorLink">?attr/textColorLinkInverse</item>
- </style>
-
- <style name="TextAppearance.Micro.Headline">
- <item name="textSize">@dimen/text_size_headline_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Title">
- <item name="textSize">@dimen/text_size_title_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Subtitle">
- <item name="textSize">@dimen/text_size_subtitle_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Body1">
- <item name="textSize">@dimen/text_size_body_1_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Body2">
- <item name="textSize">@dimen/text_size_body_2_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Caption">
- <item name="textSize">@dimen/text_size_caption_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Large">
- <item name="textSize">@dimen/text_size_large_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Medium">
- <item name="textSize">@dimen/text_size_medium_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.Small">
- <item name="textSize">@dimen/text_size_small_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Material.DialogWindowTitle">
- <item name="fontFamily">sans-serif-condensed-light</item>
- <item name="lineSpacingMultiplier">@dimen/line_spacing_multiplier_micro</item>
- <item name="textColor">?attr/textColorPrimary</item>
- <item name="textSize">@dimen/text_size_large_micro</item>
- </style>
-
- <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small" />
-
- <style name="Widget.Micro" parent="Widget.Material" />
-
- <style name="Widget.Micro.TextView" parent="Widget.Material.TextView" >
- <item name="breakStrategy">balanced</item>
- <item name="hyphenationFrequency">normal</item>
- </style>
-
- <style name="Widget.Micro.EditText" parent="Widget.Material.EditText">
- <item name="android:breakStrategy">simple</item>
- </style>
-
- <style name="Widget.Micro.NumberPicker">
- <item name="internalLayout">@layout/number_picker_with_selector_wheel_micro</item>
- <item name="solidColor">@color/transparent</item>
- <item name="selectionDivider">@drawable/numberpicker_selection_divider</item>
- <item name="selectionDividerHeight">0dip</item>
- <item name="selectionDividersDistance">104dip</item>
- <item name="internalMinWidth">64dip</item>
- <item name="internalMaxHeight">180dip</item>
- <item name="virtualButtonPressedDrawable">?attr/selectableItemBackground</item>
- <item name="descendantFocusability">blocksDescendants</item>
- </style>
-
- <style name="Widget.Micro.ButtonBar">
- <item name="background">@color/background_floating_micro_dark</item>
- </style>
-
- <style name="Widget.Micro.Button.ButtonBar.AlertDialog" parent="Widget.Material.Button.ButtonBar.AlertDialog">
- <item name="textAppearance">@style/TextAppearance.Micro.Small</item>
- <item name="maxLines">3</item>
- <item name="textColor">?attr/textColorPrimary</item>
- <item name="textAlignment">viewStart</item>
- </style>
-</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 1f6e8cf..8a88874 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1863,7 +1863,6 @@
<java-symbol type="string" name="vpn_lockdown_config" />
<java-symbol type="string" name="wallpaper_binding_label" />
<java-symbol type="style" name="Theme.Dialog.AppError" />
- <java-symbol type="style" name="Theme.Micro.Dialog.Alert" />
<java-symbol type="style" name="Theme.Leanback.Dialog.Alert" />
<java-symbol type="style" name="Theme.Toast" />
<java-symbol type="xml" name="storage_list" />
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 2ea5c5e..0e4e060 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -119,8 +119,8 @@
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>
<item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>
- <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_horizontal_material</item>
- <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_horizontal_material</item>
+ <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item>
+ <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_end_material</item>
<!-- @hide -->
<item name="searchResultListItemHeight">58dip</item>
@@ -153,9 +153,9 @@
<item name="windowBackground">?attr/colorBackground</item>
<item name="windowClipToOutline">true</item>
<item name="windowFrame">@null</item>
- <item name="windowNoTitle">false</item>
+ <item name="windowNoTitle">@bool/config_windowNoTitleDefault</item>
<item name="windowFullscreen">false</item>
- <item name="windowOverscan">false</item>
+ <item name="windowOverscan">@bool/config_windowOverscanByDefault</item>
<item name="windowIsFloating">false</item>
<item name="windowContentOverlay">@null</item>
<item name="windowShowWallpaper">false</item>
@@ -164,7 +164,7 @@
<item name="windowTitleBackgroundStyle">@style/WindowTitleBackground.Material</item>
<item name="windowAnimationStyle">@style/Animation.Material.Activity</item>
<item name="windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
- <item name="windowActionBar">true</item>
+ <item name="windowActionBar">@bool/config_windowActionBarSupported</item>
<item name="windowActionModeOverlay">false</item>
<item name="windowDrawsSystemBarBackgrounds">true</item>
<item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item>
@@ -480,8 +480,8 @@
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>
<item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>
- <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_horizontal_material</item>
- <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_horizontal_material</item>
+ <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item>
+ <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_end_material</item>
<!-- @hide -->
<item name="searchResultListItemHeight">58dip</item>
@@ -514,9 +514,9 @@
<item name="windowBackground">?attr/colorBackground</item>
<item name="windowClipToOutline">true</item>
<item name="windowFrame">@null</item>
- <item name="windowNoTitle">false</item>
+ <item name="windowNoTitle">@bool/config_windowNoTitleDefault</item>
<item name="windowFullscreen">false</item>
- <item name="windowOverscan">false</item>
+ <item name="windowOverscan">@bool/config_windowOverscanByDefault</item>
<item name="windowIsFloating">false</item>
<item name="windowContentOverlay">@null</item>
<item name="windowShowWallpaper">false</item>
@@ -525,7 +525,7 @@
<item name="windowTitleBackgroundStyle">@style/WindowTitleBackground.Material</item>
<item name="windowAnimationStyle">@style/Animation.Material.Activity</item>
<item name="windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
- <item name="windowActionBar">true</item>
+ <item name="windowActionBar">@bool/config_windowActionBarSupported</item>
<item name="windowActionModeOverlay">false</item>
<item name="windowDrawsSystemBarBackgrounds">true</item>
<item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item>
@@ -874,7 +874,7 @@
<item name="windowTitleBackgroundStyle">@style/DialogWindowTitleBackground.Material</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
<item name="windowElevation">@dimen/floating_window_z</item>
- <item name="windowIsFloating">true</item>
+ <item name="windowIsFloating">@bool/config_dialogWindowIsFloating</item>
<item name="windowContentOverlay">@null</item>
<item name="windowAnimationStyle">@style/Animation.Material.Dialog</item>
<item name="windowSoftInputMode">stateUnspecified|adjustPan</item>
@@ -1080,7 +1080,7 @@
<item name="windowTitleBackgroundStyle">@style/DialogWindowTitleBackground.Material</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
<item name="windowElevation">@dimen/floating_window_z</item>
- <item name="windowIsFloating">true</item>
+ <item name="windowIsFloating">@bool/config_dialogWindowIsFloating</item>
<item name="windowContentOverlay">@null</item>
<item name="windowAnimationStyle">@style/Animation.Material.Dialog</item>
<item name="windowSoftInputMode">stateUnspecified|adjustPan</item>
@@ -1090,10 +1090,10 @@
<item name="colorBackgroundCacheHint">@null</item>
- <item name="listPreferredItemPaddingLeft">24dip</item>
- <item name="listPreferredItemPaddingRight">24dip</item>
- <item name="listPreferredItemPaddingStart">24dip</item>
- <item name="listPreferredItemPaddingEnd">24dip</item>
+ <item name="listPreferredItemPaddingLeft">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingRight">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
<item name="listDivider">@null</item>
@@ -1201,10 +1201,10 @@
<item name="colorBackgroundCacheHint">@null</item>
- <item name="listPreferredItemPaddingLeft">24dip</item>
- <item name="listPreferredItemPaddingRight">24dip</item>
- <item name="listPreferredItemPaddingStart">24dip</item>
- <item name="listPreferredItemPaddingEnd">24dip</item>
+ <item name="listPreferredItemPaddingLeft">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingRight">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>
+ <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
<item name="listDivider">@null</item>
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml
deleted file mode 100644
index e186c8b..0000000
--- a/core/res/res/values/themes_micro.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<resources>
- <style name="Theme.MicroBase" parent="Theme.Material.NoActionBar">
- <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item>
- <item name="alertDialogStyle">@style/AlertDialog.Micro</item>
- <item name="dialogTheme">@style/Theme.Micro.Dialog</item>
- <item name="textViewStyle">@style/Widget.Micro.TextView</item>
- <item name="editTextStyle">@style/Widget.Micro.EditText</item>
- <item name="numberPickerStyle">@style/Widget.Micro.NumberPicker</item>
- <item name="windowAnimationStyle">@style/Animation.Micro.Activity</item>
- <item name="windowBackground">@color/background_micro_dark</item>
- <item name="windowContentOverlay">@null</item>
- <item name="windowIsFloating">false</item>
- <!-- Required to force windowInsets dispatch through application UI. -->
- <item name="windowOverscan">true</item>
-
- <item name="textAppearance">@style/TextAppearance.Micro</item>
- <item name="textAppearanceInverse">@style/TextAppearance.Micro.Inverse</item>
-
- <item name="textAppearanceLarge">@style/TextAppearance.Micro.Large</item>
- <item name="textAppearanceMedium">@style/TextAppearance.Micro.Medium</item>
- <item name="textAppearanceSmall">@style/TextAppearance.Micro.Small</item>
-
- <item name="textAppearanceListItem">@style/TextAppearance.Micro.Body1</item>
- <item name="textAppearanceListItemSmall">@style/TextAppearance.Micro.Body1</item>
- <item name="textAppearanceListItemSecondary">@style/TextAppearance.Micro.Caption</item>
- <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_left_micro</item>
- <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_right_micro</item>
- <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_left_micro</item>
- <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_right_micro</item>
-
- <!-- Dialog styling -->
- <item name="buttonBarStyle">@style/Widget.Micro.ButtonBar</item>
- <item name="buttonBarButtonStyle">@style/Widget.Micro.Button.ButtonBar.AlertDialog</item>
-
- <!-- Color palette -->
- <item name="colorPrimaryDark">@color/primary_dark_micro_dark</item>
- <item name="colorPrimary">@color/primary_micro_dark</item>
- <item name="colorAccent">@color/accent_micro_dark</item>
- <item name="colorEdgeEffect">?attr/colorPrimary</item>
-
- <!-- Preference styles -->
- <item name="preferenceFragmentStyle">@style/PreferenceFragment.Micro</item>
- <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Micro</item>
- <item name="preferenceStyle">@style/Preference.Micro</item>
- <item name="preferenceScreenStyle">@style/Preference.Micro.PreferenceScreen</item>
- <item name="checkBoxPreferenceStyle">@style/Preference.Micro.CheckBoxPreference</item>
- <item name="switchPreferenceStyle">@style/Preference.Micro.SwitchPreference</item>
- <item name="yesNoPreferenceStyle">@style/Preference.Micro.DialogPreference.YesNoPreference</item>
- <item name="dialogPreferenceStyle">@style/Preference.Micro.DialogPreference</item>
- <item name="seekBarDialogPreferenceStyle">@style/Preference.Micro.DialogPreference.SeekBarPreference</item>
- <item name="editTextPreferenceStyle">@style/Preference.Micro.DialogPreference.EditTextPreference</item>
- <item name="ringtonePreferenceStyle">@style/Preference.Micro.RingtonePreference</item>
- </style>
-
- <style name="Theme.Micro" parent="Theme.MicroBase">
- </style>
-
- <style name="Theme.Micro.LightBase" parent="Theme.Material.Light.NoActionBar">
- <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item>
- <item name="alertDialogStyle">@style/AlertDialog.Micro</item>
- <item name="dialogTheme">@style/Theme.Micro.Dialog</item>
- <item name="textViewStyle">@style/Widget.Micro.TextView</item>
- <item name="numberPickerStyle">@style/Widget.Micro.NumberPicker</item>
- <item name="windowAnimationStyle">@style/Animation.Micro.Activity</item>
- <item name="windowBackground">@color/white</item>
- <item name="windowContentOverlay">@null</item>
- <item name="windowIsFloating">false</item>
- <!-- Required to force windowInsets dispatch through application UI. -->
- <item name="windowOverscan">true</item>
-
- <!-- Preference styles -->
- <item name="preferenceFragmentStyle">@style/PreferenceFragment.Micro</item>
- <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Micro</item>
- <item name="preferenceStyle">@style/Preference.Micro</item>
- <item name="preferenceScreenStyle">@style/Preference.Micro.PreferenceScreen</item>
- <item name="checkBoxPreferenceStyle">@style/Preference.Micro.CheckBoxPreference</item>
- <item name="switchPreferenceStyle">@style/Preference.Micro.SwitchPreference</item>
- <item name="yesNoPreferenceStyle">@style/Preference.Micro.DialogPreference.YesNoPreference</item>
- <item name="dialogPreferenceStyle">@style/Preference.Micro.DialogPreference</item>
- <item name="seekBarDialogPreferenceStyle">@style/Preference.Micro.DialogPreference.SeekBarPreference</item>
- <item name="editTextPreferenceStyle">@style/Preference.Micro.DialogPreference.EditTextPreference</item>
- <item name="ringtonePreferenceStyle">@style/Preference.Micro.RingtonePreference</item>
- </style>
-
- <!-- Indirection needed for overlays to make sure there is a common base parent -->
- <style name="Theme.Micro.Light" parent="Theme.Micro.LightBase">
- </style>
-
- <style name="Theme.Micro.DialogBase">
- <item name="colorBackground">?attr/colorBackgroundFloating</item>
-
- <item name="windowFrame">@null</item>
- <item name="windowTitleBackgroundStyle">@style/DialogWindowTitleBackground.Material</item>
- <item name="windowElevation">@dimen/floating_window_z</item>
- <item name="windowContentOverlay">@null</item>
- <item name="windowAnimationStyle">@style/Animation.Material.Dialog</item>
- <item name="windowSoftInputMode">stateUnspecified|adjustPan</item>
- <item name="windowActionBar">false</item>
- <item name="windowActionModeOverlay">true</item>
- <item name="windowCloseOnTouchOutside">@bool/config_closeDialogWhenTouchOutside</item>
-
- <item name="colorBackgroundCacheHint">@null</item>
-
- <item name="listDivider">@null</item>
-
- <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
-
- <item name="windowTitleStyle">@style/DialogWindowTitle.Micro</item>
- <item name="windowIsFloating">false</item>
- <item name="windowFullscreen">true</item>
- <item name="windowBackground">@color/background_micro_dark</item>
- <!-- Required to force windowInsets dispatch through application UI. -->
- <item name="windowOverscan">true</item>
- </style>
-
- <!-- Indirection needed for overlays to make sure there is a common base parent -->
- <style name="Theme.Micro.Dialog" parent="Theme.Micro.DialogBase">
- </style>
-
- <style name="Theme.Micro.Dialog.Alert">
- <item name="windowTitleStyle">@style/DialogWindowTitle.Micro</item>
- <item name="alertDialogStyle">@style/AlertDialog.Micro</item>
- <item name="windowIsFloating">false</item>
- <item name="windowOverscan">true</item>
- <item name="windowContentOverlay">@null</item>
- <item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
- <item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
- </style>
-
- <style name="Theme.Micro.Dialog.AppError" parent="Theme.Micro.Dialog">
- <item name="alertDialogStyle">@style/AlertDialog.Micro</item>
- <item name="textAppearance">@style/TextAppearance.Micro.Large</item>
- <item name="windowOverscan">true</item>
- <item name="windowCloseOnTouchOutside">false</item>
- </style>
-
- <style name="Theme.Micro.Panel" parent="Theme.Material.Panel" />
- <style name="Theme.Micro.Light.Panel" parent="Theme.Material.Light.Panel" />
-
- <!-- Default theme for material style input methods, which is used by the
- {@link android.inputmethodservice.InputMethodService} class.
- This inherits from Theme.Panel, but sets up IME appropriate animations
- and a few custom attributes. -->
- <style name="Theme.Micro.InputMethod" parent="Theme.Micro.Panel">
- <item name="windowAnimationStyle">@style/Animation.InputMethod</item>
- <item name="imeFullscreenBackground">#1e282c</item>
- <item name="imeExtractEnterAnimation">@anim/input_method_extract_enter</item>
- <item name="imeExtractExitAnimation">@anim/input_method_extract_exit</item>
- </style>
-</resources>
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 16103ba..777b57d 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6878,9 +6878,7 @@
@Override public void run() {
if (mBootMsgDialog == null) {
int theme;
- if (mHasFeatureWatch) {
- theme = com.android.internal.R.style.Theme_Micro_Dialog_Alert;
- } else if (mContext.getPackageManager().hasSystemFeature(FEATURE_TELEVISION)) {
+ if (mContext.getPackageManager().hasSystemFeature(FEATURE_TELEVISION)) {
theme = com.android.internal.R.style.Theme_Leanback_Dialog_Alert;
} else {
theme = 0;