Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev (074c3404) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -826,6 +826,7 @@ package android {
		field public static final int listViewWhiteStyle = 16842869; // 0x1010075
		field public static final int lockTaskMode = 16844015; // 0x10104ef
		field public static final int logo = 16843454; // 0x10102be
		field public static final int logoDescription = 16844026; // 0x10104fa
		field public static final int longClickable = 16842982; // 0x10100e6
		field public static final int loopViews = 16843527; // 0x1010307
		field public static final int manageSpaceActivity = 16842756; // 0x1010004
		@@ -1178,6 +1179,7 @@ package android {
		field public static final int submitBackground = 16843912; // 0x1010488
		field public static final int subtitle = 16843473; // 0x10102d1
		field public static final int subtitleTextAppearance = 16843823; // 0x101042f
		field public static final int subtitleTextColor = 16844028; // 0x10104fc
		field public static final int subtitleTextStyle = 16843513; // 0x10102f9
		field public static final int subtypeExtraValue = 16843674; // 0x101039a
		field public static final int subtypeId = 16843713; // 0x10103c1
		@@ -1308,6 +1310,7 @@ package android {
		field public static final int title = 16843233; // 0x10101e1
		field public static final int titleCondensed = 16843234; // 0x10101e2
		field public static final int titleTextAppearance = 16843822; // 0x101042e
		field public static final int titleTextColor = 16844027; // 0x10104fb
		field public static final int titleTextStyle = 16843512; // 0x10102f8
		field public static final int toAlpha = 16843211; // 0x10101cb
		field public static final int toDegrees = 16843188; // 0x10101b4

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -901,6 +901,7 @@ package android {
		field public static final int listViewWhiteStyle = 16842869; // 0x1010075
		field public static final int lockTaskMode = 16844015; // 0x10104ef
		field public static final int logo = 16843454; // 0x10102be
		field public static final int logoDescription = 16844026; // 0x10104fa
		field public static final int longClickable = 16842982; // 0x10100e6
		field public static final int loopViews = 16843527; // 0x1010307
		field public static final int manageSpaceActivity = 16842756; // 0x1010004
		@@ -1257,6 +1258,7 @@ package android {
		field public static final int submitBackground = 16843912; // 0x1010488
		field public static final int subtitle = 16843473; // 0x10102d1
		field public static final int subtitleTextAppearance = 16843823; // 0x101042f
		field public static final int subtitleTextColor = 16844028; // 0x10104fc
		field public static final int subtitleTextStyle = 16843513; // 0x10102f9
		field public static final int subtypeExtraValue = 16843674; // 0x101039a
		field public static final int subtypeId = 16843713; // 0x10103c1
		@@ -1387,6 +1389,7 @@ package android {
		field public static final int title = 16843233; // 0x10101e1
		field public static final int titleCondensed = 16843234; // 0x10101e2
		field public static final int titleTextAppearance = 16843822; // 0x101042e
		field public static final int titleTextColor = 16844027; // 0x10104fb
		field public static final int titleTextStyle = 16843512; // 0x10102f8
		field public static final int toAlpha = 16843211; // 0x10101cb
		field public static final int toDegrees = 16843188; // 0x10101b4

core/java/android/widget/Toolbar.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,24 @@ public class Toolbar extends ViewGroup {
		if (!TextUtils.isEmpty(navDesc)) {
		setNavigationContentDescription(navDesc);
		}

		final Drawable logo = a.getDrawable(R.styleable.Toolbar_logo);
		if (logo != null) {
		setLogo(logo);
		}

		final CharSequence logoDesc = a.getText(R.styleable.Toolbar_logoDescription);
		if (!TextUtils.isEmpty(logoDesc)) {
		setLogoDescription(logoDesc);
		}

		if (a.hasValue(R.styleable.Toolbar_titleTextColor)) {
		setTitleTextColor(a.getColor(R.styleable.Toolbar_titleTextColor, 0xffffffff));
		}

		if (a.hasValue(R.styleable.Toolbar_subtitleTextColor)) {
		setSubtitleTextColor(a.getColor(R.styleable.Toolbar_subtitleTextColor, 0xffffffff));
		}
		a.recycle();
		}

core/res/res/values/attrs.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -7775,6 +7775,16 @@ i
		<!-- Text to set as the content description for the navigation button
		located at the start of the toolbar. -->
		<attr name="navigationContentDescription" format="string" />
		<!-- Drawable to set as the logo that appears at the starting side of
		the Toolbar, just after the navigation button. -->
		<attr name="logo" />
		<!-- A content description string to describe the appearance of the
		associated logo image. -->
		<attr name="logoDescription" format="string" />
		<!-- A color to apply to the title string. -->
		<attr name="titleTextColor" format="color" />
		<!-- A color to apply to the subtitle string. -->
		<attr name="subtitleTextColor" format="color" />
		</declare-styleable>

		<declare-styleable name="Toolbar_LayoutParams">

core/res/res/values/public.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2699,4 +2699,7 @@
		<public type="attr" name="scrollIndicators" />
		<public type="attr" name="hyphenationFrequency" />
		<public type="attr" name="fingerprintAuthDrawable" />
		<public type="attr" name="logoDescription" />
		<public type="attr" name="titleTextColor" />
		<public type="attr" name="subtitleTextColor" />
		</resources>