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

Commit c6b5dd48 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Move background data notif to data saver status icon" into nyc-dev

parents eb3771cd f23aa992

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <string-array name="config_statusBarIcons">

        <item><xliff:g id="id">@string/status_bar_rotate</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_headset</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_data_saver</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_ime</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_sync_failing</xliff:g></item>
@@ -56,6 +57,7 @@ 


    <string translatable="false" name="status_bar_rotate">rotate</string>

    <string translatable="false" name="status_bar_headset">headset</string>

    <string translatable="false" name="status_bar_data_saver">data_saver</string>

    <string translatable="false" name="status_bar_managed_profile">managed_profile</string>

    <string translatable="false" name="status_bar_ime">ime</string>

    <string translatable="false" name="status_bar_sync_failing">sync_failing</string>

core/res/res/values/symbols.xml

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


  <java-symbol type="string" name="status_bar_rotate" />

  <java-symbol type="string" name="status_bar_headset" />

  <java-symbol type="string" name="status_bar_data_saver" />

  <java-symbol type="string" name="status_bar_managed_profile" />

  <java-symbol type="string" name="status_bar_ime" />

  <java-symbol type="string" name="status_bar_sync_failing" />

packages/SystemUI/res/drawable/stat_sys_data_saver.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:insetLeft="2.5dp"

    android:insetRight="2.5dp">

    <vector

        android:width="17.0dp"

        android:height="17.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        <path

            android:fillColor="#FFFFFFFF"

            android:pathData="

            M9.0,16.0l2.0,0.0L11.0,8.0L9.0,8.0l0.0,8.0z

            m3.0,-14.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0z

            m0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0z

            m1.0,-4.0l2.0,0.0l0.0,-8.0l-2.0,0.0l0.0,8.0z"/>

    </vector>

</inset>

packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public class DataSaverTile extends QSTile<QSTile.BooleanState> implements 
        state.value = arg instanceof Boolean ? (Boolean) arg

                : mDataSaverController.isDataSaverEnabled();

        state.label = mContext.getString(R.string.data_saver);

        state.contentDescription = mContext.getString(state.value ?

                R.string.accessibility_data_saver_on : R.string.accessibility_data_saver_off);

        state.contentDescription = mContext.getString(state.value

                ? R.string.accessibility_data_saver_on : R.string.accessibility_data_saver_off);

        state.icon = ResourceIcon.get(state.value ? R.drawable.ic_data_saver

                : R.drawable.ic_data_saver_off);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mIconController, mCastController,

                mHotspotController, mUserInfoController, mBluetoothController,

                mRotationLockController);

                mRotationLockController, mNetworkController.getDataSaverController());

        mIconPolicy.setCurrentUserSetup(mUserSetup);

        mSettingsObserver.onChange(false); // set up