Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a397bc authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "The COLORS!!"

parents 2bc1427e 36f469fa

api/current.txt

+15 −0
Original line number Original line Diff line number Diff line
@@ -312,10 +312,15 @@ package android { 
    field public static final int codes = 16843330; // 0x1010242

    field public static final int codes = 16843330; // 0x1010242

    field public static final int collapseColumns = 16843083; // 0x101014b

    field public static final int collapseColumns = 16843083; // 0x101014b

    field public static final int color = 16843173; // 0x10101a5

    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 colorBackground = 16842801; // 0x1010031

    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab

    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 colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206

    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 columnCount = 16843638; // 0x1010376

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843639; // 0x1010377

    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 background_light = 17170447; // 0x106000f

    field public static final int black = 17170444; // 0x106000c

    field public static final int black = 17170444; // 0x106000c

    field public static final int darker_gray = 17170432; // 0x1060000

    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 = 17170433; // 0x1060001

    field public static final int primary_text_dark_nodisable = 17170434; // 0x1060002

    field public static final int primary_text_dark_nodisable = 17170434; // 0x1060002

    field public static final int primary_text_light = 17170435; // 0x1060003

    field public static final int primary_text_light = 17170435; // 0x1060003

core/res/res/layout-xlarge/activity_list.xml

+4 −13
Original line number Original line Diff line number Diff line
@@ -54,21 +54,15 @@ 
                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

                android:layout_height="wrap_content" />

        </LinearLayout>

        </LinearLayout>

        <ImageView android:id="@+id/titleDivider"

        <View android:id="@+id/titleDivider"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="4dip"

            android:layout_height="2dip"

            android:layout_marginLeft="16dip"

            android:background="@android:color/holo_blue_light" />

            android:layout_marginRight="16dip"

            android:scaleType="fitXY"

            android:gravity="fill_horizontal"

            android:src="@android:drawable/divider_strong_holo" />

        <!-- If the client uses a customTitle, it will be added here. -->

        <!-- If the client uses a customTitle, it will be added here. -->

    </LinearLayout>

    </LinearLayout>





    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_marginLeft="32dip"

        android:layout_marginRight="32dip"

        android:layout_height="0dip"

        android:layout_height="0dip"

        android:layout_weight="1">

        android:layout_weight="1">
@@ -95,15 +89,12 @@ 
        android:minHeight="54dip"

        android:minHeight="54dip"

        android:orientation="vertical"

        android:orientation="vertical"

        android:divider="?android:attr/dividerHorizontal"

        android:divider="?android:attr/dividerHorizontal"

        android:showDividers="beginning"

        android:showDividers="beginning">

        android:dividerPadding="16dip">

        <LinearLayout

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:orientation="horizontal"

            android:paddingLeft="2dip"

            android:paddingRight="2dip"

            android:measureWithLargestChild="true">

            android:measureWithLargestChild="true">

            <LinearLayout android:id="@+id/leftSpacer"

            <LinearLayout android:id="@+id/leftSpacer"

                android:layout_weight="0.25"

                android:layout_weight="0.25"

core/res/res/layout/activity_chooser_list_footer.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -23,13 +23,11 @@ 
    android:gravity="center"

    android:gravity="center"

    android:orientation="vertical">

    android:orientation="vertical">





    <ImageView

    <View

        android:id="@+id/divider"

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="2dip"

        android:layout_height="2dip"

        android:scaleType="fitXY"

        android:background="@android:color/holo_blue_light" />

        android:gravity="fill_horizontal"

        android:src="@drawable/divider_strong_holo" />





    <TextView

    <TextView

        android:id="@+id/title"

        android:id="@+id/title"

core/res/res/layout/activity_chooser_list_header.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -32,12 +32,10 @@ 
        android:duplicateParentState="true"

        android:duplicateParentState="true"

        android:singleLine="true" />

        android:singleLine="true" />





    <ImageView

    <View

        android:id="@+id/divider"

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="2dip"

        android:layout_height="2dip"

        android:scaleType="fitXY"

        android:gravity="fill_horizontal"

        android:src="@drawable/divider_strong_holo" />

        android:src="@drawable/divider_strong_holo" />





</LinearLayout>
 
</LinearLayout>

core/res/res/layout/alert_dialog_holo.xml

+7 −12
Original line number Original line Diff line number Diff line
@@ -30,13 +30,11 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        android:orientation="vertical">

        <ImageView android:id="@+id/titleDividerTop"

        <View android:id="@+id/titleDividerTop"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="1dip"

            android:layout_height="2dip"

            android:visibility="gone"

            android:visibility="gone"

            android:scaleType="fitXY"

            android:background="@android:color/holo_blue_light" />

            android:gravity="fill_horizontal"

            android:src="@android:drawable/divider_strong_holo" />

        <LinearLayout android:id="@+id/title_template"

        <LinearLayout android:id="@+id/title_template"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"
@@ -51,20 +49,17 @@ 
                android:paddingRight="8dip"

                android:paddingRight="8dip"

                android:src="@null" />

                android:src="@null" />

            <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"

            <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"

                style="?android:attr/textAppearanceLarge"

                style="?android:attr/windowTitleStyle"

                android:textColor="@android:color/holo_blue"

                android:singleLine="true"

                android:singleLine="true"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

                android:layout_height="wrap_content" />

        </LinearLayout>

        </LinearLayout>

        <ImageView android:id="@+id/titleDivider"

        <View android:id="@+id/titleDivider"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="1dip"

            android:layout_height="2dip"

            android:visibility="gone"

            android:visibility="gone"

            android:scaleType="fitXY"

            android:background="@android:color/holo_blue_light" />

            android:gravity="fill_horizontal"

            android:src="@android:drawable/divider_strong_holo" />

        <!-- If the client uses a customTitle, it will be added here. -->

        <!-- If the client uses a customTitle, it will be added here. -->

    </LinearLayout>

    </LinearLayout>