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

Commit 943a3df4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 913f7dcc: Merge "Set primary color of SystemUI." 

* commit '913f7dcc1938f8609f0f9f0acf6a8dbc586bc961':
  Set primary color of SystemUI.
parents 86543724 54257654

packages/SystemUI/res/drawable/notification_header_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_pressed="true">

        <shape>

            <solid android:color="#ff54656e" />

            <solid android:color="@color/background_color_1_press" />

            <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

    <item>

        <shape>

            <solid android:color="#ff384248" />

            <solid android:color="@color/background_color_1" />

            <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

packages/SystemUI/res/layout/status_bar_toggle_slider.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        android:layout_alignParentTop="true"

        android:layout_alignParentBottom="true"

        android:button="@null"

        android:background="@*android:drawable/switch_track_quantum"

        />

    <com.android.systemui.settings.ToggleSeekBar

        android:id="@+id/slider"

packages/SystemUI/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -62,4 +62,8 @@ 
    <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. -->

    <color name="recents_task_bar_dark_dismiss_color">#ff333333</color>



    <!-- Our quantum color palette (deep teal) -->

    <color name="primary_color">#ff7fcac3</color>

    <color name="background_color_1">#ff384248</color>

    <color name="background_color_1_press">#ff54656e</color>

</resources>

packages/SystemUI/res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -168,7 +168,9 @@ 
        <item name="android:textSize">14dp</item>

    </style>



    <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault" />

    <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault">

        <item name="android:colorPrimary">@color/primary_color</item>

    </style>



    <style name="NotificationsQuickSettings">

        <item name="android:layout_width">match_parent</item>

packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class ToggleSlider extends RelativeLayout { 


        mToggle = (CompoundButton) findViewById(R.id.toggle);

        mToggle.setOnCheckedChangeListener(mCheckListener);

        mToggle.setBackground(res.getDrawable(R.drawable.status_bar_toggle_button));



        mSlider = (SeekBar) findViewById(R.id.slider);

        mSlider.setOnSeekBarChangeListener(mSeekListener);