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

Merge "The COLORS!!"

Browse Source
This commit is contained in:
Adam Powell
2011-07-08 15:38:31 -07:00
committed by Android (Google) Code Review
parent 2bc1427e90 36f469fa46
commit 94a397bcf2
13 changed files with 116 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/current.txt
View File

@@ -312,10 +312,15 @@ package android {
field public static final int codes = 16843330; // 0x1010242
field public static final int collapseColumns = 16843083; // 0x101014b
field public static final int color = 16843173; // 0x10101a5
field public static final int colorActivatedHighlight = 16843684; // 0x10103a4
field public static final int colorBackground = 16842801; // 0x1010031
field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab
field public static final int colorFocusedHighlight = 16843683; // 0x10103a3
field public static final int colorForeground = 16842800; // 0x1010030
field public static final int colorForegroundInverse = 16843270; // 0x1010206
field public static final int colorLongPressedHighlight = 16843682; // 0x10103a2
field public static final int colorMultiSelectHighlight = 16843685; // 0x10103a5
field public static final int colorPressedHighlight = 16843681; // 0x10103a1
field public static final int columnCount = 16843638; // 0x1010376
field public static final int columnDelay = 16843215; // 0x10101cf
field public static final int columnOrderPreserved = 16843639; // 0x1010377
@@ -1121,6 +1126,16 @@ package android {
field public static final int background_light = 17170447; // 0x106000f
field public static final int black = 17170444; // 0x106000c
field public static final int darker_gray = 17170432; // 0x1060000
field public static final int holo_blue_bright = 17170459; // 0x106001b
field public static final int holo_blue_dark = 17170451; // 0x1060013
field public static final int holo_blue_light = 17170450; // 0x1060012
field public static final int holo_green_dark = 17170453; // 0x1060015
field public static final int holo_green_light = 17170452; // 0x1060014
field public static final int holo_orange_dark = 17170457; // 0x1060019
field public static final int holo_orange_light = 17170456; // 0x1060018
field public static final int holo_purple = 17170458; // 0x106001a
field public static final int holo_red_dark = 17170455; // 0x1060017
field public static final int holo_red_light = 17170454; // 0x1060016
field public static final int primary_text_dark = 17170433; // 0x1060001
field public static final int primary_text_dark_nodisable = 17170434; // 0x1060002
field public static final int primary_text_light = 17170435; // 0x1060003

17
core/res/res/layout-xlarge/activity_list.xml
View File

@@ -54,21 +54,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView android:id="@+id/titleDivider"
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="4dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:layout_height="2dip"
android:background="@android:color/holo_blue_light" />
<!-- If the client uses a customTitle, it will be added here. -->
</LinearLayout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_marginLeft="32dip"
android:layout_marginRight="32dip"
android:layout_height="0dip"
android:layout_weight="1">
@@ -95,15 +89,12 @@
android:minHeight="54dip"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning"
android:dividerPadding="16dip">
android:showDividers="beginning">
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="2dip"
android:paddingRight="2dip"
android:measureWithLargestChild="true">
<LinearLayout android:id="@+id/leftSpacer"
android:layout_weight="0.25"

6
core/res/res/layout/activity_chooser_list_footer.xml
View File

@@ -23,13 +23,11 @@
android:gravity="center"
android:orientation="vertical">
<ImageView
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="2dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@drawable/divider_strong_holo" />
android:background="@android:color/holo_blue_light" />
<TextView
android:id="@+id/title"

4
core/res/res/layout/activity_chooser_list_header.xml
View File

@@ -32,12 +32,10 @@
android:duplicateParentState="true"
android:singleLine="true" />
<ImageView
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="2dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@drawable/divider_strong_holo" />
</LinearLayout>

19
core/res/res/layout/alert_dialog_holo.xml
View File

@@ -30,13 +30,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView android:id="@+id/titleDividerTop"
<View android:id="@+id/titleDividerTop"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_height="2dip"
android:visibility="gone"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:background="@android:color/holo_blue_light" />
<LinearLayout android:id="@+id/title_template"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -51,20 +49,17 @@
android:paddingRight="8dip"
android:src="@null" />
<com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
style="?android:attr/textAppearanceLarge"
android:textColor="@android:color/holo_blue"
style="?android:attr/windowTitleStyle"
android:singleLine="true"
android:ellipsize="end"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView android:id="@+id/titleDivider"
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_height="2dip"
android:visibility="gone"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:background="@android:color/holo_blue_light" />
<!-- If the client uses a customTitle, it will be added here. -->
</LinearLayout>

8
core/res/res/layout/dialog_custom_title_holo.xml
View File

@@ -28,12 +28,10 @@ This is an custom layout for a dialog.
android:gravity="center_vertical|left"
style="?android:attr/windowTitleBackgroundStyle">
</FrameLayout>
<ImageView android:id="@+id/titleDivider"
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:layout_height="2dip"
android:background="@android:color/holo_blue_light" />
<FrameLayout
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"

8
core/res/res/layout/dialog_title_holo.xml
View File

@@ -30,12 +30,10 @@ enabled.
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:gravity="center_vertical|left" />
<ImageView android:id="@+id/titleDivider"
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:layout_height="2dip"
android:background="@android:color/holo_blue_light" />
<FrameLayout
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"

6
core/res/res/layout/dialog_title_icons_holo.xml
View File

@@ -48,12 +48,10 @@ enabled.
android:layout_marginLeft="8dip" />
</LinearLayout>
<ImageView android:id="@+id/titleDivider"
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:src="@android:drawable/divider_strong_holo" />
android:background="@android:color/holo_blue_light" />
<FrameLayout
android:layout_width="match_parent" android:layout_height="wrap_content"

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

@@ -40,6 +40,21 @@
to use accelerated drawing (thus setting state_accelerated), the
cache hint is ignored and always assumed to be transparent. -->
<attr name="colorBackgroundCacheHint" format="color" />
<!-- Default highlight color for items that are pressed. -->
<attr name="colorPressedHighlight" format="color" />
<!-- Default highlight color for items that are long-pressed. -->
<attr name="colorLongPressedHighlight" format="color" />
<!-- Default highlight color for items that are
focused. (Focused meaning cursor-based selection.) -->
<attr name="colorFocusedHighlight" format="color" />
<!-- Default highlight color for items that are
activated. (Activated meaning persistent selection.) -->
<attr name="colorActivatedHighlight" format="color" />
<!-- Default highlight color for items in multiple selection
mode. -->
<attr name="colorMultiSelectHighlight" format="color" />
<!-- Default disabled alpha for widgets that set enabled/disabled alpha programmatically. -->
<attr name="disabledAlpha" format="float" />
<!-- Default background dim amount when a menu, dialog, or something similar pops up. -->

31
core/res/res/values/colors.xml
View File

@@ -143,19 +143,42 @@
<color name="link_text_holo_light">#0000ee</color>
<!-- Group buttons -->
<eat-comment />
<color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color>
<color name="group_button_dialog_focused_holo_dark">#2699cc00</color>
<color name="group_button_dialog_pressed_holo_light">#ffffffff</color>
<color name="group_button_dialog_focused_holo_light">#4699cc00</color>
<!-- Highlight colors for the legacy themes -->
<eat-comment />
<color name="legacy_pressed_highlight">#fffeaa0c</color>
<color name="legacy_selected_highlight">#fff17a0a</color>
<color name="legacy_long_pressed_highlight">#ffffffff</color>
<!-- General purpose colors for Holo-themed elements -->
<eat-comment />
<!-- A Holo shade of blue -->
<color name="holo_blue">#ff6699ff</color>
<!-- A Holo shade of green -->
<color name="holo_green">#ff99cc00</color>
<!-- A light Holo shade of blue -->
<color name="holo_blue_light">#ff33b5e5</color>
<!-- A light Holo shade of green -->
<color name="holo_green_light">#ff99cc00</color>
<!-- A light Holo shade of red -->
<color name="holo_red_light">#ffff4444</color>
<!-- A dark Holo shade of blue -->
<color name="holo_blue_dark">#ff0099cc</color>
<!-- A dark Holo shade of green -->
<color name="holo_green_dark">#ff669900</color>
<!-- A dark Holo shade of red -->
<color name="holo_red_dark">#ffcc0000</color>
<!-- A Holo shade of purple -->
<color name="holo_purple">#ffaa66cc</color>
<!-- A light Holo shade of orange -->
<color name="holo_orange_light">#ffffbb33</color>
<!-- A dark Holo shade of orange -->
<color name="holo_orange_dark">#ffff8800</color>
<!-- A really bright Holo shade of blue -->
<color name="holo_blue_bright">#ff00ddff</color>
</resources>

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

@@ -1781,6 +1781,12 @@
<public type="attr" name="textAllCaps" />
<public type="attr" name="colorPressedHighlight" />
<public type="attr" name="colorLongPressedHighlight" />
<public type="attr" name="colorFocusedHighlight" />
<public type="attr" name="colorActivatedHighlight" />
<public type="attr" name="colorMultiSelectHighlight" />
<public type="style" name="TextAppearance.SuggestionHighlight" />
<public type="style" name="Theme.Holo.SplitActionBarWhenNarrow" />
<public type="style" name="Theme.Holo.Light.SplitActionBarWhenNarrow" />
@@ -1809,4 +1815,15 @@
<public type="integer" name="status_bar_notification_info_maxnum" />
<public type="string" name="status_bar_notification_info_overflow" />
<public type="color" name="holo_blue_light" />
<public type="color" name="holo_blue_dark" />
<public type="color" name="holo_green_light" />
<public type="color" name="holo_green_dark" />
<public type="color" name="holo_red_light" />
<public type="color" name="holo_red_dark" />
<public type="color" name="holo_orange_light" />
<public type="color" name="holo_orange_dark" />
<public type="color" name="holo_purple" />
<public type="color" name="holo_blue_bright" />
</resources>

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

@@ -1356,7 +1356,7 @@
<style name="TextAppearance.Holo.DialogWindowTitle">
<item name="android:textSize">22sp</item>
<item name="android:textColor">@android:color/holo_blue</item>
<item name="android:textColor">@android:color/holo_blue_light</item>
</style>
<style name="TextAppearance.Holo.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView">
@@ -1455,7 +1455,7 @@
<style name="TextAppearance.Holo.Light.DialogWindowTitle">
<item name="android:textSize">22sp</item>
<item name="android:textColor">@android:color/holo_blue</item>
<item name="android:textColor">@android:color/holo_blue_light</item>
</style>
<style name="TextAppearance.Holo.Light.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView">

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

@@ -31,6 +31,13 @@
<item name="colorForegroundInverse">@android:color/bright_foreground_dark_inverse</item>
<item name="colorBackground">@android:color/background_dark</item>
<item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>
<item name="colorPressedHighlight">@color/legacy_pressed_highlight</item>
<item name="colorLongPressedHighlight">@color/legacy_long_pressed_highlight</item>
<item name="colorFocusedHighlight">@color/legacy_selected_highlight</item>
<item name="colorMultiSelectHighlight">@color/legacy_selected_highlight</item>
<item name="colorActivatedHighlight">@color/legacy_selected_highlight</item>
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
@@ -799,6 +806,12 @@
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
<item name="colorPressedHighlight">@color/holo_blue_light</item>
<item name="colorLongPressedHighlight">@color/holo_blue_bright</item>
<item name="colorFocusedHighlight">@color/holo_blue_dark</item>
<item name="colorMultiSelectHighlight">@color/holo_green_light</item>
<item name="colorActivatedHighlight">@color/holo_blue_dark</item>
<!-- Text styles -->
<item name="textAppearance">@android:style/TextAppearance.Holo</item>
<item name="textAppearanceInverse">@android:style/TextAppearance.Holo.Inverse</item>
@@ -1090,6 +1103,11 @@
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
<item name="colorPressedHighlight">@color/holo_blue_light</item>
<item name="colorLongPressedHighlight">@color/holo_blue_bright</item>
<item name="colorFocusedHighlight">@color/holo_blue_dark</item>
<item name="colorMultiSelectHighlight">@color/holo_green_light</item>
<item name="colorActivatedHighlight">@color/holo_blue_dark</item>
<!-- Text styles -->
<item name="textAppearance">@android:style/TextAppearance.Holo.Light</item>