Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '096d52fb' into manualmerge

Browse Source 
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
This commit is contained in:
Alan Viverette
2014-06-04 11:42:06 -07:00
parent 5398aec700 55a54e17df
commit 22b893fde1
11 changed files with 121 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

677
api/current.txt
View File

File diff suppressed because it is too large Load Diff

2
core/java/android/widget/EdgeEffect.java
View File

@@ -122,7 +122,7 @@ public class EdgeEffect {
final TypedArray a = context.obtainStyledAttributes(
com.android.internal.R.styleable.EdgeEffect);
final int themeColor = a.getColor(
com.android.internal.R.styleable.EdgeEffect_colorPrimaryLight, 0xff666666);
com.android.internal.R.styleable.EdgeEffect_colorPrimary, 0xff666666);
a.recycle();
mPaint.setColor((themeColor & 0xffffff) | 0x33000000);
mPaint.setStyle(Paint.Style.FILL);

17
core/res/res/drawable/edit_text_quantum.xml
View File

@@ -15,25 +15,20 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlActivated">
android:tint="?attr/colorControlActivated"
android:tintMode="src_over">
<item>
<selector>
<item android:state_window_focused="false">
<nine-patch android:src="@drawable/textfield_default_qntm_alpha"
android:tint="?attr/colorControlNormal" />
</item>
<item android:state_enabled="false">
<nine-patch android:src="@drawable/textfield_default_qntm_alpha"
android:tint="?attr/colorControlNormal" />
</item>
<item android:state_focused="false" android:state_activated="false">
<nine-patch android:src="@drawable/textfield_default_qntm_alpha"
android:tint="?attr/colorControlNormal" />
android:tint="?attr/colorControlNormal"
android:alpha="?attr/disabledAlpha" />
</item>
<item>
<nine-patch android:src="@drawable/textfield_activated_qntm_alpha"
<nine-patch android:src="@drawable/textfield_default_qntm_alpha"
android:tint="?attr/colorControlNormal" />
</item>
</selector>
</item>
<item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_qntm_alpha" />
</ripple>

12
core/res/res/values/attrs.xml
View File

@@ -963,17 +963,15 @@
<eat-comment />
<!-- The primary branding color for the app. By default, this is the color applied to the
action bar background and framework controls (via colorControlActivated). -->
action bar background. -->
<attr name="colorPrimary" format="color" />
<!-- Dark variant of the primary branding color. By default, this is the color applied to
the status bar (via statusBarColor) and navigation bar (via navigationBarColor). -->
<attr name="colorPrimaryDark" format="color" />
<!-- Light variant of the primary branding color. TODO: Not used? -->
<attr name="colorPrimaryLight" format="color" />
<!-- Bright complement to the primary branding color. TODO: Not used? -->
<!-- Bright complement to the primary branding color. By default, this is the color applied
to framework controls (via colorControlActivated). -->
<attr name="colorAccent" format="color" />
<!-- The color applied to framework controls in their normal state. -->
@@ -982,7 +980,7 @@
<!-- The color applied to framework controls in their activated (ex. checked) state. -->
<attr name="colorControlActivated" format="color" />
<!-- The color applied to framework control highlights (ex. ripples, selection). -->
<!-- The color applied to framework control highlights (ex. ripples, list selectors). -->
<attr name="colorControlHighlight" format="color" />
<!-- The color applied to framework buttons in their normal state. -->
@@ -6719,7 +6717,7 @@
<!-- Used as a filter array on the theme to pull out only the EdgeEffect-relevant bits. -->
<declare-styleable name="EdgeEffect">
<attr name="colorPrimaryLight" />
<attr name="colorPrimary" />
</declare-styleable>
<!-- Use <code>tv-input</code> as the root tag of the XML resource that describes an

56
core/res/res/values/colors_quantum.xml
View File

@@ -16,20 +16,22 @@
<!-- Colors specific to Quantum themes. -->
<resources>
<color name="background_quantum_dark">#ff414042</color>
<color name="background_quantum_light">#fff1f2f2</color>
<color name="background_quantum_dark">#ff212121</color>
<color name="background_quantum_light">#fffafafa</color>
<!-- Black 27% -->
<color name="ripple_quantum_light">#45000000</color>
<!-- White 19% -->
<color name="ripple_quantum_dark">#30ffffff</color>
<color name="ripple_quantum_light">#30000000</color>
<color name="button_quantum_dark">#ff5a595b</color>
<color name="button_quantum_light">#ffd6d7d7</color>
<color name="bright_foreground_quantum_dark">@color/white</color>
<color name="bright_foreground_quantum_light">@color/black</color>
<!-- TODO: This is 50% alpha black -->
<!-- Black 50% -->
<color name="bright_foreground_disabled_quantum_dark">#80000000</color>
<!-- TODO: This is 50% alpha white -->
<!-- White 50% -->
<color name="bright_foreground_disabled_quantum_light">#80ffffff</color>
<color name="bright_foreground_inverse_quantum_dark">@color/bright_foreground_quantum_light</color>
<color name="bright_foreground_inverse_quantum_light">@color/bright_foreground_quantum_dark</color>
@@ -41,10 +43,27 @@
<color name="hint_foreground_quantum_dark">@color/bright_foreground_disabled_quantum_dark</color>
<color name="hint_foreground_quantum_light">@color/bright_foreground_disabled_quantum_light</color>
<!-- TODO: This is 40% alpha teal_A200 -->
<color name="highlighted_text_quantum_dark">#660097a7</color>
<!-- TODO: This is 40% alpha teal_A200 -->
<color name="highlighted_text_quantum_light">#660097a7</color>
<!-- TODO: This is 40% alpha on the default accent color. -->
<color name="highlighted_text_quantum_dark">#6640c4ff</color>
<!-- TODO: This is 40% alpha on the default accent color. -->
<color name="highlighted_text_quantum_light">#6640c4ff</color>
<!-- Text & foreground colors -->
<eat-comment />
<!-- Black 87% -->
<color name="primary_text_default_quantum_light">#de000000</color>
<!-- Black 54% -->
<color name="secondary_text_quantum_light">#8a000000</color>
<!-- Black 54% (TODO: same as secondary?) -->
<color name="tertiary_text_quantum_light">#8a000000</color>
<!-- White 87% -->
<color name="primary_text_default_quantum_dark">#deffffff</color>
<!-- White 38% -->
<color name="secondary_text_quantum_dark">#61ffffff</color>
<!-- White 38% (TODO: same as secondary?) -->
<color name="tertiary_text_quantum_dark">#61ffffff</color>
<!-- Primary & accent colors -->
<eat-comment />
@@ -63,6 +82,8 @@
<color name="quantum_blue_A200">#ff448aff</color>
<color name="quantum_blue_A400">#ff2979ff</color>
<color name="quantum_light_blue_A200">#ff40c4ff</color>
<color name="quantum_teal_100">#ffb2ebf2</color>
<color name="quantum_teal_300">#ff4dd0e1</color>
<color name="quantum_teal_500">#ff00bcd4</color>
@@ -112,27 +133,22 @@
<color name="quantum_grey_100">#fff5f5f5</color>
<color name="quantum_grey_300">#ffeeeeee</color>
<color name="quantum_grey_500">#ffa3a3a3</color>
<color name="quantum_grey_600">#ff757575</color>
<color name="quantum_grey_700">#ff717171</color>
<color name="quantum_grey_900">#ff212121</color>
<color name="quantum_blue_grey_50">#ffeceff1</color>
<color name="quantum_blue_grey_100">#ffcfd8dc</color>
<color name="quantum_blue_grey_300">#ff90a4ae</color>
<color name="quantum_blue_grey_400">#ff78909c</color>
<color name="quantum_blue_grey_500">#ff607d8b</color>
<color name="quantum_blue_grey_600">#ff546e7a</color>
<color name="quantum_blue_grey_700">#ff455a64</color>
<color name="quantum_blue_grey_800">#ff37474f</color>
<color name="quantum_blue_grey_900">#ff263238</color>
<color name="quantum_brown_100">#ffd7ccc8</color>
<color name="quantum_brown_300">#ffa1887f</color>
<color name="quantum_brown_500">#ff795548</color>
<color name="quantum_brown_700">#ff5d4037</color>
<!-- Text & foreground colors -->
<eat-comment />
<color name="primary_text_default_quantum_light">#de000000</color>
<color name="secondary_text_quantum_light">#8a000000</color>
<color name="tertiary_text_quantum_light">#4d000000</color>
<color name="primary_text_default_quantum_dark">#deffffff</color>
<color name="secondary_text_quantum_dark">#8affffff</color>
<color name="tertiary_text_quantum_dark">#4dffffff</color>
</resources>

1
core/res/res/values/public.xml
View File

@@ -2142,7 +2142,6 @@
<public type="attr" name="slideEdge" />
<public type="attr" name="actionBarTheme" />
<public type="attr" name="textAppearanceListItemSecondary" />
<public type="attr" name="colorPrimaryLight" />
<public type="attr" name="colorPrimary" />
<public type="attr" name="colorPrimaryDark" />
<public type="attr" name="colorAccent" />

6
core/res/res/values/styles_quantum.xml
View File

@@ -511,11 +511,11 @@ please see styles_device_defaults.xml.
<item name="disabledColor">@color/bright_foreground_disabled_quantum_dark</item>
<item name="headerSelectedTextColor">?attr/colorControlActivated</item>
<item name="headerUnselectedTextColor">?attr/textColorPrimary</item>
<item name="headerBackgroundColor">?attr/colorBackground</item>
<item name="headerBackgroundColor">@color/transparent</item>
<item name="numbersTextColor">?attr/textColorSecondary</item>
<item name="numbersBackgroundColor">?attr/colorControlNormal</item>
<item name="numbersBackgroundColor">@color/transparent</item>
<item name="amPmTextColor">?attr/textColorSecondary</item>
<item name="amPmUnselectedBackgroundColor">?attr/colorControlNormal</item>
<item name="amPmUnselectedBackgroundColor">@color/transparent</item>
<item name="amPmSelectedBackgroundColor">?attr/colorControlActivated</item>
<item name="numbersSelectorColor">?attr/colorControlActivated</item>
</style>

4
core/res/res/values/themes.xml
View File

@@ -55,7 +55,6 @@ please see themes_device_defaults.xml.
<item name="colorPrimaryDark">@color/legacy_primary_dark</item>
<item name="colorPrimary">@color/legacy_primary</item>
<item name="colorPrimaryLight">@color/legacy_primary_light</item>
<item name="colorControlActivated">@color/legacy_control_activated</item>
<item name="colorControlNormal">@color/legacy_control_normal</item>
<item name="colorControlHighlight">@color/legacy_button_pressed</item>
@@ -454,7 +453,6 @@ please see themes_device_defaults.xml.
<item name="colorPrimaryDark">@color/legacy_light_primary_dark</item>
<item name="colorPrimary">@color/legacy_light_primary</item>
<item name="colorPrimaryLight">@color/legacy_light_primary_light</item>
<item name="colorControlActivated">@color/legacy_light_control_activated</item>
<item name="colorControlNormal">@color/legacy_light_control_normal</item>
<item name="colorControlHighlight">@color/legacy_light_button_pressed</item>
@@ -969,7 +967,6 @@ please see themes_device_defaults.xml.
<item name="colorPrimaryDark">@color/holo_primary_dark</item>
<item name="colorPrimary">@color/holo_primary</item>
<item name="colorPrimaryLight">@color/holo_primary_light</item>
<item name="colorControlActivated">@color/holo_control_activated</item>
<item name="colorControlNormal">@color/holo_control_normal</item>
<item name="colorControlHighlight">@color/holo_button_pressed</item>
@@ -1310,7 +1307,6 @@ please see themes_device_defaults.xml.
<item name="colorPrimaryDark">@color/holo_light_primary_dark</item>
<item name="colorPrimary">@color/holo_light_primary</item>
<item name="colorPrimaryLight">@color/holo_light_primary_light</item>
<item name="colorControlActivated">@color/holo_light_control_activated</item>
<item name="colorControlNormal">@color/holo_light_control_normal</item>
<item name="colorControlHighlight">@color/holo_light_button_pressed</item>

29
core/res/res/values/themes_quantum.xml
View File

@@ -164,7 +164,7 @@ please see themes_device_defaults.xml.
<item name="windowDrawsSystemBarBackgrounds">true</item>
<item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item>
<item name="statusBarColor">?attr/colorPrimaryDark</item>
<item name="navigationBarColor">?attr/colorPrimaryDark</item>
<item name="navigationBarColor">@color/black</item>
<!-- Dialog attributes -->
<item name="dialogTheme">@style/Theme.Quantum.Dialog</item>
@@ -371,13 +371,12 @@ please see themes_device_defaults.xml.
<item name="fastScrollOverlayPosition">atThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/quantum_blue_700</item>
<item name="colorPrimary">@color/quantum_blue_500</item>
<item name="colorPrimaryLight">@color/quantum_blue_100</item>
<item name="colorAccent">@color/quantum_teal_A200</item>
<item name="colorPrimaryDark">@color/quantum_blue_grey_900</item>
<item name="colorPrimary">@color/quantum_blue_grey_800</item>
<item name="colorAccent">@color/quantum_light_blue_A200</item>
<item name="colorControlNormal">?attr/textColorSecondary</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="colorControlActivated">?attr/colorAccent</item>
<item name="colorControlHighlight">@color/ripple_quantum_dark</item>
<item name="colorButtonNormal">@color/btn_default_quantum_dark</item>
@@ -508,7 +507,7 @@ please see themes_device_defaults.xml.
<item name="windowDrawsSystemBarBackgrounds">true</item>
<item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item>
<item name="statusBarColor">?attr/colorPrimaryDark</item>
<item name="navigationBarColor">?attr/colorPrimaryDark</item>
<item name="navigationBarColor">@color/black</item>
<!-- Dialog attributes -->
<item name="dialogTheme">@style/Theme.Quantum.Light.Dialog</item>
@@ -714,13 +713,12 @@ please see themes_device_defaults.xml.
<item name="fastScrollOverlayPosition">atThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/quantum_blue_700</item>
<item name="colorPrimary">@color/quantum_blue_500</item>
<item name="colorPrimaryLight">@color/quantum_blue_100</item>
<item name="colorAccent">@color/quantum_teal_A200</item>
<item name="colorPrimaryDark">@color/quantum_blue_grey_600</item>
<item name="colorPrimary">@color/quantum_blue_grey_400</item>
<item name="colorAccent">@color/quantum_light_blue_A200</item>
<item name="colorControlNormal">?attr/textColorSecondary</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="colorControlActivated">?attr/colorAccent</item>
<item name="colorControlHighlight">@color/ripple_quantum_light</item>
<item name="colorButtonNormal">@color/btn_default_quantum_light</item>
@@ -810,11 +808,10 @@ please see themes_device_defaults.xml.
<item name="colorButtonNormal">@color/btn_default_quantum_dark</item>
</style>
<!-- Theme overlay that replaces the activated control color (which by default
is identical to the action bar background color) with the normal control
color. -->
<!-- Theme overlay that replaces the normal control color, which by default is the same as the
secondary text color, with the primary text color. -->
<style name="ThemeOverlay.Quantum.ActionBarWidget">
<item name="colorControlActivated">?attr/colorControlNormal</item>
<item name="colorControlNormal">?attr/textColorPrimary</item>
</style>
<!-- Variant of the quantum (dark) theme with no action bar. -->

7
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -23,10 +23,12 @@ import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Insets;
import android.graphics.NinePatch;
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
import android.graphics.PorterDuff.Mode;
@@ -236,7 +238,6 @@ public class NinePatchDrawable extends Drawable {
final boolean needsMirroring = needsMirroring();
if (needsMirroring) {
canvas.save();
// Mirror the 9patch
canvas.translate(bounds.right - bounds.left, 0);
canvas.scale(-1.0f, 1.0f);
@@ -253,10 +254,6 @@ public class NinePatchDrawable extends Drawable {
mNinePatch.draw(canvas, bounds, mPaint);
if (needsMirroring) {
canvas.restore();
}
if (clearColorFilter) {
mPaint.setColorFilter(null);
}

3
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -619,6 +619,9 @@ public class RippleDrawable extends LayerDrawable {
final int restoreToCount = canvas.saveLayer(bounds.left, bounds.top,
bounds.right, bounds.bottom, getMaskingPaint(mode));
// Ensure that DST_IN blends using the entire layer.
canvas.drawColor(Color.TRANSPARENT);
mask.draw(canvas);
return restoreToCount;