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

Commit 11ed40f0 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro Committed by Android (Google) Code Review
Browse files

Merge "Set statusbar color" into lmp-dev

parents b6c36dbd 3dc0b60d

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="21" ></uses-sdk>



    <application android:label="@string/app_label"

                 android:icon="@mipmap/ic_launcher_alarmclock"

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


    <!-- App icon color as default -->

    <color name="default_background">#5c6bc0</color>

    <color name="status_bar">#26000000</color>



    <color name="notification_bg">#ff15444F</color>

    <color name="alarm_selected_color">#aa0099cc</color>

res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    </style>



    <style name="DeskClockParentTheme" parent="@android:style/Theme.Material">

        <item name="android:statusBarColor">@color/status_bar</item>

        <item name="android:colorControlActivated">@color/hot_pink</item>

        <item name="android:colorControlNormal">@color/white</item>

        <item name="android:actionOverflowMenuStyle">@style/PopupMenu</item>
@@ -109,6 +110,7 @@ 
         be unable to turn the screen on. -->

    <style name="AlarmAlertFullScreenTheme"

           parent="@android:style/Theme.Material.Wallpaper.NoTitleBar">

        <item name="android:statusBarColor">@color/status_bar</item>

        <item name="android:windowTitleStyle">@style/AlarmAlertFullScreenWindowTitle</item>

    </style>

src/com/android/deskclock/SettingsActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -99,9 +99,7 @@ public class SettingsActivity extends PreferenceActivity 
    @Override

    protected void onResume() {

        super.onResume();

        final int color = Utils.getCurrentHourColor();

        getWindow().setStatusBarColor(color);

        getWindow().getDecorView().setBackgroundColor(color);

        getWindow().getDecorView().setBackgroundColor(Utils.getCurrentHourColor());

        refresh();

    }

src/com/android/deskclock/alarms/AlarmActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class AlarmActivity extends Activity { 
        // Color the main view instead of content view, because this view is stacked on top of

        // the reveal view, which has a solid color. We don't want that solid color to show up here.

        final int currentHourColor = Utils.getCurrentHourColor();

        findViewById(R.id.main_layout).setBackgroundColor(currentHourColor);

        getWindow().getDecorView().setBackgroundColor(currentHourColor);

        initializeButtonListeners(currentHourColor);

        updateTimeAndTitle();