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

Commit 50bff6fb authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #15696670 Settings > Apps using old Holo colors in tabs, space indicator"

parents 83234b64 e5c75ab4

res/layout/manage_applications_apps.xml

+1 −4
Original line number Original line Diff line number Diff line
@@ -70,10 +70,7 @@ 
                android:layout_weight="0"

                android:layout_weight="0"

                android:layout_marginTop="-20dp"

                android:layout_marginTop="-20dp"

                android:textAppearance="?android:attr/textAppearanceSmallInverse"

                android:textAppearance="?android:attr/textAppearanceSmallInverse"

                android:textColor="#ccc"

                android:textColor="?android:attr/textColorPrimary"

                android:shadowColor="#000"

                android:shadowRadius="5"

                android:textStyle="bold"

                android:singleLine="true"

                android:singleLine="true"

                android:text="@string/internal_storage" />

                android:text="@string/internal_storage" />

            <TextView android:id="@+id/freeStorageText"

            <TextView android:id="@+id/freeStorageText"

res/layout/running_processes_view.xml

+1 −4
Original line number Original line Diff line number Diff line
@@ -71,10 +71,7 @@ 
            android:layout_weight="0"

            android:layout_weight="0"

            android:layout_marginTop="-20dp"

            android:layout_marginTop="-20dp"

            android:textAppearance="?android:attr/textAppearanceSmallInverse"

            android:textAppearance="?android:attr/textAppearanceSmallInverse"

            android:textColor="#ccc"

            android:textColor="?android:attr/textColorPrimary"

            android:shadowColor="#000"

            android:shadowRadius="5"

            android:textStyle="bold"

            android:singleLine="true"

            android:singleLine="true"

            android:text="@string/memory" />

            android:text="@string/memory" />

        <TextView android:id="@+id/backgroundText"

        <TextView android:id="@+id/backgroundText"

src/com/android/settings/applications/LinearColorBar.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ import android.view.MotionEvent; 
import android.widget.LinearLayout;

import android.widget.LinearLayout;





public class LinearColorBar extends LinearLayout {

public class LinearColorBar extends LinearLayout {

    static final int LEFT_COLOR = 0xff0099cc;

    static final int LEFT_COLOR = 0xff009688;

    static final int MIDDLE_COLOR = 0xff0099cc;

    static final int MIDDLE_COLOR = 0xff009688;

    static final int RIGHT_COLOR = 0xff888888;

    static final int RIGHT_COLOR = 0xffced7db;

    static final int GRAY_COLOR = 0xff555555;

    static final int GRAY_COLOR = 0xff555555;

    static final int WHITE_COLOR = 0xffffffff;

    static final int WHITE_COLOR = 0xffffffff;