Update leanback alert dialogs.
Now based on Material instead of Holo. b/15418510 Change-Id: I69103b429ff1b4f66b3968fa64e652182833652f
This commit is contained in:
@@ -1,20 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 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.
|
||||
*/
|
||||
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.
|
||||
-->
|
||||
|
||||
<LinearLayout
|
||||
@@ -22,11 +20,13 @@
|
||||
android:id="@+id/parentPanel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:background="@drawable/dialog_background_material"
|
||||
android:translationZ="@dimen/floating_window_z"
|
||||
android:layout_marginLeft="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/leanback_alert_dialog_vertical_margin"
|
||||
android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin"
|
||||
android:orientation="vertical">
|
||||
android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin">
|
||||
|
||||
<LinearLayout android:id="@+id/topPanel"
|
||||
android:layout_width="match_parent"
|
||||
@@ -37,16 +37,17 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical|start"
|
||||
android:minHeight="@dimen/alert_dialog_title_height"
|
||||
android:layout_marginStart="16dip"
|
||||
android:layout_marginEnd="16dip">
|
||||
android:paddingStart="16dip"
|
||||
android:paddingEnd="16dip"
|
||||
android:paddingTop="16dip">
|
||||
<ImageView android:id="@+id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingEnd="8dip"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="32dip"
|
||||
android:layout_marginEnd="8dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@null" />
|
||||
<com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
|
||||
style="?android:attr/windowTitleStyle"
|
||||
<TextView android:id="@+id/alertTitle"
|
||||
style="?attr/windowTitleStyle"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:layout_width="match_parent"
|
||||
@@ -67,13 +68,12 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:clipToPadding="false">
|
||||
<TextView android:id="@+id/message"
|
||||
style="?android:attr/textAppearanceMedium"
|
||||
style="?attr/textAppearanceMedium"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="16dip"
|
||||
android:paddingEnd="16dip"
|
||||
android:paddingTop="8dip"
|
||||
android:paddingBottom="8dip"/>
|
||||
android:paddingTop="16dip" />
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -91,41 +91,32 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
android:gravity="end"
|
||||
android:padding="16dip">
|
||||
<LinearLayout
|
||||
style="?android:attr/buttonBarStyle"
|
||||
android:layout_width="match_parent"
|
||||
style="?attr/buttonBarStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layoutDirection="locale"
|
||||
android:measureWithLargestChild="true">
|
||||
<Button android:id="@+id/button2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="start"
|
||||
android:layout_weight="1"
|
||||
android:maxLines="2"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:layout_height="wrap_content" />
|
||||
android:layoutDirection="locale">
|
||||
<Button android:id="@+id/button3"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:layout_height="wrap_content" />
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
<Button android:id="@+id/button2"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
<Button android:id="@+id/button1"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:layout_height="wrap_content" />
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 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.
|
||||
*/
|
||||
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.
|
||||
-->
|
||||
|
||||
<LinearLayout
|
||||
@@ -22,18 +20,20 @@
|
||||
android:id="@+id/parentPanel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/dialog_background_material"
|
||||
android:translationZ="@dimen/floating_window_z"
|
||||
android:layout_marginLeft="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/leanback_alert_dialog_vertical_margin"
|
||||
android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin"
|
||||
android:orientation="horizontal">
|
||||
android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
|
||||
android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/leftPanel"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="0.66"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:id="@+id/leftPanel"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout android:id="@+id/topPanel"
|
||||
android:layout_width="match_parent"
|
||||
@@ -44,16 +44,17 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical|start"
|
||||
android:minHeight="@dimen/alert_dialog_title_height"
|
||||
android:layout_marginStart="16dip"
|
||||
android:layout_marginEnd="16dip">
|
||||
android:paddingStart="16dip"
|
||||
android:paddingEnd="16dip"
|
||||
android:paddingTop="16dip">
|
||||
<ImageView android:id="@+id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingEnd="8dip"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="32dip"
|
||||
android:layout_marginEnd="8dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@null" />
|
||||
<com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
|
||||
style="?android:attr/windowTitleStyle"
|
||||
<TextView android:id="@+id/alertTitle"
|
||||
style="?attr/windowTitleStyle"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:layout_width="match_parent"
|
||||
@@ -66,6 +67,7 @@
|
||||
<LinearLayout android:id="@+id/contentPanel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:minHeight="64dp">
|
||||
<ScrollView android:id="@+id/scrollView"
|
||||
@@ -73,13 +75,13 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:clipToPadding="false">
|
||||
<TextView android:id="@+id/message"
|
||||
style="?android:attr/textAppearanceMedium"
|
||||
style="?attr/textAppearanceMedium"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="16dip"
|
||||
android:paddingEnd="16dip"
|
||||
android:paddingTop="8dip"
|
||||
android:paddingBottom="8dip"/>
|
||||
android:paddingTop="16dip"
|
||||
android:paddingBottom="16dip" />
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -92,51 +94,41 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/buttonPanel"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="0.33"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:background="#ffffff"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:paddingLeft="32dp"
|
||||
android:paddingRight="32dp"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="vertical"
|
||||
android:gravity="end"
|
||||
android:padding="16dip">
|
||||
<LinearLayout
|
||||
style="?android:attr/buttonBarStyle"
|
||||
android:layout_width="match_parent"
|
||||
style="?attr/buttonBarStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:orientation="vertical"
|
||||
android:layoutDirection="locale"
|
||||
android:measureWithLargestChild="true">
|
||||
<Button android:id="@+id/button1"
|
||||
android:layout_width="match_parent"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:maxLines="2"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:layout_height="wrap_content" />
|
||||
android:orientation="vertical">
|
||||
<Button android:id="@+id/button3"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="match_parent"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
android:layout_height="wrap_content" />
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
<Button android:id="@+id/button2"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="match_parent"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height"
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:textSize="14sp"
|
||||
android:layout_height="wrap_content" />
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
<Button android:id="@+id/button1"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:minHeight="@dimen/alert_dialog_button_bar_height" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 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.
|
||||
*/
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="2dip"
|
||||
android:background="@android:color/leanback_dark_gray" />
|
||||
<LinearLayout android:id="@+id/body"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:baselineAligned="false"
|
||||
android:padding="16dip">
|
||||
|
||||
<ProgressBar android:id="@android:id/progress"
|
||||
style="?android:attr/progressBarStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:max="10000"
|
||||
android:layout_marginEnd="16dip" />
|
||||
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -16,8 +16,13 @@
|
||||
<resources>
|
||||
<style name="Theme.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
|
||||
<style name="Theme.Dialog.AppError" parent="Theme.Leanback.Dialog.AppError" />
|
||||
<style name="Theme.Dialog.TimePicker" parent="Theme.Leanback.Dialog.TimePicker" />
|
||||
<style name="Theme.Holo.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />
|
||||
<style name="Theme.Holo.Dialog.TimePicker" parent="Theme.Leanback.Dialog.TimePicker" />
|
||||
<style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
|
||||
<style name="Theme.Holo.Light.Dialog.TimePicker" parent="Theme.Leanback.Light.Dialog.TimePicker" />
|
||||
<style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />
|
||||
<style name="Theme.Material.Dialog.TimePicker" parent="Theme.Leanback.Dialog.TimePicker" />
|
||||
<style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
|
||||
<style name="Theme.Material.Light.Dialog.TimePicker" parent="Theme.Leanback.Light.Dialog.TimePicker" />
|
||||
</resources>
|
||||
|
||||
@@ -16,4 +16,6 @@
|
||||
<resources>
|
||||
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
|
||||
<style name="Theme.DeviceDefault.Dialog.TimePicker" parent="Theme.Leanback.Dialog.TimePicker" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.TimePicker" parent="Theme.Leanback.Light.Dialog.TimePicker" />
|
||||
</resources>
|
||||
|
||||
@@ -125,9 +125,6 @@
|
||||
|
||||
<color name="micro_text_light">#434343</color>
|
||||
|
||||
<color name="leanback_dark_gray">#ff333333</color>
|
||||
<color name="leanback_light_gray">#ff888888</color>
|
||||
|
||||
<drawable name="notification_template_icon_bg">#3333B5E5</drawable>
|
||||
<drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
|
||||
|
||||
|
||||
28
core/res/res/values/colors_leanback.xml
Normal file
28
core/res/res/values/colors_leanback.xml
Normal file
@@ -0,0 +1,28 @@
|
||||
<?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.
|
||||
-->
|
||||
|
||||
<!-- Colors specific to Leanback themes. -->
|
||||
<resources>
|
||||
<color name="background_leanback_dark">#ff324248</color>
|
||||
<color name="background_leanback_light">#ffeeeeee</color>
|
||||
|
||||
<color name="primary_text_leanback_dark">#cceeeeee</color>
|
||||
<color name="secondary_text_leanback_dark">#99eeeeee</color>
|
||||
|
||||
<color name="primary_text_leanback_light">#cc222222</color>
|
||||
<color name="secondary_text_leanback_light">#99222222</color>
|
||||
|
||||
</resources>
|
||||
@@ -14,46 +14,12 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<style name="DialogWindowTitle.Leanback" parent="DialogWindowTitle.Holo">
|
||||
<item name="android:textAppearance">@style/TextAppearance.Leanback.DialogWindowTitle</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Leanback.DialogWindowTitle" parent="TextAppearance.Holo.DialogWindowTitle">
|
||||
<item name="android:fontFamily">sans-serif-condensed</item>
|
||||
<item name="android:textColor">?attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Leanback.ButtonBar" parent="Holo.ButtonBar">
|
||||
<item name="showDividers">none</item>
|
||||
</style>
|
||||
|
||||
<style name="AlertDialog.Leanback" parent="AlertDialog.Holo">
|
||||
<style name="AlertDialog.Leanback" parent="AlertDialog.Material">
|
||||
<item name="layout">@android:layout/alert_dialog_leanback</item>
|
||||
<item name="buttonPanelSideLayout">@android:layout/alert_dialog_leanback_button_panel_right</item>
|
||||
<item name="progressLayout">@android:layout/progress_dialog_leanback</item>
|
||||
<item name="fullDark">@android:color/background_dark</item>
|
||||
<item name="topDark">@android:color/background_dark</item>
|
||||
<item name="centerDark">@android:color/background_dark</item>
|
||||
<item name="bottomDark">@android:color/background_dark</item>
|
||||
<item name="fullBright">@android:color/background_dark</item>
|
||||
<item name="topBright">@android:color/background_dark</item>
|
||||
<item name="centerBright">@android:color/background_dark</item>
|
||||
<item name="bottomBright">@android:color/background_dark</item>
|
||||
<item name="bottomMedium">@android:color/background_dark</item>
|
||||
<item name="centerMedium">@android:color/background_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="AlertDialog.Leanback.Light">
|
||||
<item name="fullDark">@android:color/leanback_light_gray</item>
|
||||
<item name="topDark">@android:color/leanback_light_gray</item>
|
||||
<item name="centerDark">@android:color/leanback_light_gray</item>
|
||||
<item name="bottomDark">@android:color/leanback_light_gray</item>
|
||||
<item name="fullBright">@android:color/leanback_light_gray</item>
|
||||
<item name="topBright">@android:color/leanback_light_gray</item>
|
||||
<item name="centerBright">@android:color/leanback_light_gray</item>
|
||||
<item name="bottomBright">@android:color/leanback_light_gray</item>
|
||||
<item name="bottomMedium">@android:color/leanback_light_gray</item>
|
||||
<item name="centerMedium">@android:color/leanback_light_gray</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -14,26 +14,38 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<style name="Theme.Leanback.Dialog.Alert" parent="Theme.Holo.Dialog.BaseAlert">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Leanback</item>
|
||||
<style name="Theme.Leanback.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert">
|
||||
<item name="colorBackground">@color/background_leanback_dark</item>
|
||||
<item name="textColorPrimary">@color/primary_text_leanback_dark</item>
|
||||
<item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
|
||||
<item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
|
||||
<item name="buttonBarStyle">@style/Leanback.ButtonBar</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Light.Dialog.Alert" parent="Theme.Holo.Light.Dialog.BaseAlert">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Leanback</item>
|
||||
<style name="Theme.Leanback.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.BaseAlert">
|
||||
<item name="colorBackground">@color/background_leanback_light</item>
|
||||
<item name="textColorPrimary">@color/primary_text_leanback_light</item>
|
||||
<item name="textColorSecondary">@color/secondary_text_leanback_light</item>
|
||||
<item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>
|
||||
<item name="buttonBarStyle">@style/Leanback.ButtonBar</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Light.Dialog" parent="Theme.Holo.Light.Dialog">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Leanback</item>
|
||||
<style name="Theme.Leanback.Dialog.TimePicker" parent="Theme.Material.Dialog.BaseTimePicker">
|
||||
<item name="colorBackground">@color/background_leanback_dark</item>
|
||||
<item name="textColorPrimary">@color/primary_text_leanback_dark</item>
|
||||
<item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
|
||||
<item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Dialog" parent="Theme.Holo.Dialog">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Leanback</item>
|
||||
<style name="Theme.Leanback.Light.Dialog.TimePicker" parent="Theme.Material.Light.Dialog.BaseTimePicker">
|
||||
<item name="colorBackground">@color/background_leanback_light</item>
|
||||
<item name="textColorPrimary">@color/primary_text_leanback_light</item>
|
||||
<item name="textColorSecondary">@color/secondary_text_leanback_light</item>
|
||||
<item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.Dialog">
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Dialog" parent="Theme.Material.Dialog">
|
||||
</style>
|
||||
|
||||
<style name="Theme.Leanback.Dialog.AppError" parent="Theme.Leanback.Dialog">
|
||||
|
||||
@@ -1092,26 +1092,30 @@ please see themes_device_defaults.xml.
|
||||
<item name="windowCloseOnTouchOutside">false</item>
|
||||
</style>
|
||||
|
||||
<!-- Material theme for alert dialog windows, which is used by the
|
||||
{@link android.app.AlertDialog} class. This is basically a dialog
|
||||
but sets the background to empty so it can do two-tone backgrounds.
|
||||
For applications targeting Honeycomb or newer, this is the default
|
||||
AlertDialog theme. -->
|
||||
<style name="Theme.Material.Dialog.Alert">
|
||||
<style name="Theme.Material.Dialog.BaseAlert">
|
||||
<item name="windowBackground">@color/transparent</item>
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
|
||||
<item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
|
||||
<item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
|
||||
</style>
|
||||
|
||||
<!-- Material theme for the TimePicker dialog windows, which is used by the
|
||||
{@link android.app.TimePickerDialog} class. -->
|
||||
<style name="Theme.Material.Dialog.TimePicker">
|
||||
<!-- Material theme for alert dialog windows, which is used by the
|
||||
{@link android.app.AlertDialog} class. This is basically a dialog
|
||||
but sets the background to empty so it can do two-tone backgrounds.
|
||||
For applications targeting Honeycomb or newer, this is the default
|
||||
AlertDialog theme. -->
|
||||
<style name="Theme.Material.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert"/>
|
||||
|
||||
<style name="Theme.Material.Dialog.BaseTimePicker">
|
||||
<item name="windowBackground">@color/transparent</item>
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
|
||||
<item name="windowContentOverlay">@null</item>
|
||||
</style>
|
||||
|
||||
<!-- Material theme for the TimePicker dialog windows, which is used by the
|
||||
{@link android.app.TimePickerDialog} class. -->
|
||||
<style name="Theme.Material.Dialog.TimePicker" parent="Theme.Material.Dialog.BaseTimePicker"/>
|
||||
|
||||
<!-- Theme for a window that will be displayed either full-screen on
|
||||
smaller screens (small, normal) or as a dialog on larger screens
|
||||
(large, xlarge). -->
|
||||
@@ -1206,25 +1210,29 @@ please see themes_device_defaults.xml.
|
||||
(large, xlarge). -->
|
||||
<style name="Theme.Material.Light.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.Light.NoActionBar" />
|
||||
|
||||
<!-- Material light theme for alert dialog windows, which is used by the
|
||||
{@link android.app.AlertDialog} class. This is basically a dialog
|
||||
but sets the background to empty so it can do two-tone backgrounds.
|
||||
For applications targeting Honeycomb or newer, this is the default
|
||||
AlertDialog theme. -->
|
||||
<style name="Theme.Material.Light.Dialog.Alert">
|
||||
<style name="Theme.Material.Light.Dialog.BaseAlert">
|
||||
<item name="windowBackground">@color/transparent</item>
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
|
||||
<item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
|
||||
<item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
|
||||
</style>
|
||||
|
||||
<!-- Material Light theme for the TimePicker dialog windows, which is used by the
|
||||
{@link android.app.TimePickerDialog} class. -->
|
||||
<style name="Theme.Material.Light.Dialog.TimePicker">
|
||||
<!-- Material light theme for alert dialog windows, which is used by the
|
||||
{@link android.app.AlertDialog} class. This is basically a dialog
|
||||
but sets the background to empty so it can do two-tone backgrounds.
|
||||
For applications targeting Honeycomb or newer, this is the default
|
||||
AlertDialog theme. -->
|
||||
<style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.BaseAlert"/>
|
||||
|
||||
<style name="Theme.Material.Light.Dialog.BaseTimePicker">
|
||||
<item name="windowBackground">@color/transparent</item>
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
|
||||
</style>
|
||||
|
||||
<!-- Material Light theme for the TimePicker dialog windows, which is used by the
|
||||
{@link android.app.TimePickerDialog} class. -->
|
||||
<style name="Theme.Material.Light.Dialog.TimePicker" parent="Theme.Material.Light.Dialog.BaseTimePicker"/>
|
||||
|
||||
<!-- Theme for a presentation window on a secondary display. -->
|
||||
<style name="Theme.Material.Light.Dialog.Presentation" parent="@style/Theme.Material.Light.NoActionBar.Fullscreen" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user