Merge "Make the positive dialog button use accent color" (999a7389) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -347,6 +347,9 @@ package android {
		field public static final int bufferType = 16843086; // 0x101014e
		field public static final int button = 16843015; // 0x1010107
		field public static final int buttonBarButtonStyle = 16843567; // 0x101032f
		field public static final int buttonBarNegativeButtonStyle = 16843917; // 0x101048d
		field public static final int buttonBarNeutralButtonStyle = 16843916; // 0x101048c
		field public static final int buttonBarPositiveButtonStyle = 16843915; // 0x101048b
		field public static final int buttonBarStyle = 16843566; // 0x101032e
		field public static final int buttonStyle = 16842824; // 0x1010048
		field public static final int buttonStyleInset = 16842826; // 0x101004a
		@@ -2384,6 +2387,7 @@ package android {
		field public static final int Widget_Material_ButtonBar = 16974439; // 0x1030267
		field public static final int Widget_Material_ButtonBar_AlertDialog = 16974440; // 0x1030268
		field public static final int Widget_Material_Button_Borderless = 16974434; // 0x1030262
		field public static final int Widget_Material_Button_Borderless_Colored = 16974556; // 0x10302dc
		field public static final int Widget_Material_Button_Borderless_Small = 16974435; // 0x1030263
		field public static final int Widget_Material_Button_Inset = 16974436; // 0x1030264
		field public static final int Widget_Material_Button_Small = 16974437; // 0x1030265
		@@ -2417,6 +2421,7 @@ package android {
		field public static final int Widget_Material_Light_ButtonBar = 16974500; // 0x10302a4
		field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974501; // 0x10302a5
		field public static final int Widget_Material_Light_Button_Borderless = 16974495; // 0x103029f
		field public static final int Widget_Material_Light_Button_Borderless_Colored = 16974557; // 0x10302dd
		field public static final int Widget_Material_Light_Button_Borderless_Small = 16974496; // 0x10302a0
		field public static final int Widget_Material_Light_Button_Inset = 16974497; // 0x10302a1
		field public static final int Widget_Material_Light_Button_Small = 16974498; // 0x10302a2

core/res/res/anim/disabled_anim_material.xml

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		<?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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_enabled="false">
		<set>
		<objectAnimator android:propertyName="alpha"
		android:duration="@integer/disabled_alpha_animation_duration"
		android:valueTo="?attr/disabledAlpha"
		android:valueType="floatType"/>
		</set>
		</item>
		<item>
		<set>
		<objectAnimator android:propertyName="alpha"
		android:duration="@integer/disabled_alpha_animation_duration"
		android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</item>
		</selector>
		No newline at end of file

core/res/res/layout/alert_dialog_material.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:minHeight="64dp">
		<FrameLayout android:id="@+android:id/custom"
		<FrameLayout android:id="@+id/custom"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		</FrameLayout>
		@@ -101,7 +101,7 @@
		android:layout_height="wrap_content"
		android:layoutDirection="locale">
		<Button android:id="@+id/button3"
		style="?attr/buttonBarButtonStyle"
		style="?attr/buttonBarNeutralButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="2"
		@@ -112,13 +112,13 @@
		android:layout_weight="1"
		android:visibility="invisible" />
		<Button android:id="@+id/button2"
		style="?attr/buttonBarButtonStyle"
		style="?attr/buttonBarNegativeButtonStyle"
		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"
		style="?attr/buttonBarPositiveButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="2"

core/res/res/values/attrs.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -894,6 +894,15 @@
		<!-- Style for buttons within button bars -->
		<attr name="buttonBarButtonStyle" format="reference" />

		<!-- Style for the "positive" buttons within button bars -->
		<attr name="buttonBarPositiveButtonStyle" format="reference" />

		<!-- Style for the "negative" buttons within button bars -->
		<attr name="buttonBarNegativeButtonStyle" format="reference" />

		<!-- Style for the "neutral" buttons within button bars -->
		<attr name="buttonBarNeutralButtonStyle" format="reference" />

		<!-- Style for the search query widget. -->
		<attr name="searchViewStyle" format="reference" />

core/res/res/values/integers.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,4 +21,5 @@
		<integer name="kg_glowpad_rotation_offset">0</integer>
		<integer name="button_pressed_animation_duration">100</integer>
		<integer name="button_pressed_animation_delay">100</integer>
		<integer name="disabled_alpha_animation_duration">100</integer>
		</resources>