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

Commit 87319d15 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '000-a15-fixes' into 'v3.0-a15' 

Android 15: wallet tile and 3 navigation bar

See merge request e/os/android_frameworks_base!285
parents c2ebd505 2c9eb5e9

packages/SystemUI/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 


    <!-- The default tiles to display in QuickSettings -->

    <string name="quick_settings_tiles_default" translatable="false">

        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.v33.SafetyCenterQsTileService)

        internet,bt,flashlight,dnd,alarm,airplane,controls,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.v33.SafetyCenterQsTileService)

    </string>



    <!-- The class path of the Safety Quick Settings Tile -->
@@ -119,7 +119,7 @@ 


    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->

    <string name="quick_settings_tiles_stock" translatable="false">

        internet,wifi,cell,bt,flashlight,dnd,alarm,airplane,nfc,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,ambient_display,aod,caffeine,heads_up,powershare,profiles,reading_mode,sync,usb_tether,vpn

        internet,wifi,cell,bt,flashlight,dnd,alarm,airplane,nfc,controls,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,ambient_display,aod,caffeine,heads_up,powershare,profiles,reading_mode,sync,usb_tether,vpn

    </string>



    <!-- The tiles to display in QuickSettings -->

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

+11 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.systemui.shared.statusbar.phone.BarTransitions.MODE_LI 
import static com.android.systemui.shared.statusbar.phone.BarTransitions.MODE_TRANSPARENT;



import android.content.Context;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.util.Log;

import android.view.Display;
@@ -136,8 +137,11 @@ public class LightBarControllerImpl implements 
    private final NavigationModeController.ModeChangedListener mNavigationModeListener =

            (mode) -> mNavigationMode = mode;



    private Context mContext;



    @AssistedInject

    public LightBarControllerImpl(

            Context ctx,

            @Assisted int displayId,

            @Assisted CoroutineScope coroutineScope,

            @Assisted DarkIconDispatcher darkIconDispatcher,
@@ -147,6 +151,7 @@ public class LightBarControllerImpl implements 
            DumpManager dumpManager,

            @Main CoroutineContext mainContext,

            BiometricUnlockController biometricUnlockController) {

        mContext = ctx;

        mDisplayId = displayId;

        mCoroutineScope = coroutineScope;

        mStatusBarIconController = (SysuiDarkIconDispatcher) darkIconDispatcher;
@@ -244,7 +249,7 @@ public class LightBarControllerImpl implements 
            final boolean ignoreScrimForce = mDirectReplying && mNavbarColorManagedByIme;

            final boolean darkForScrim = mForceDarkForScrim && !ignoreScrimForce;

            final boolean lightForScrim = mForceLightForScrim && !ignoreScrimForce;

            final boolean darkForQs = (mQsCustomizing || mQsExpanded) && !mBouncerVisible;

            final boolean darkForQs = isNightMode() && (!mQsCustomizing && !mQsExpanded) && mBouncerVisible;

            final boolean darkForTop = darkForQs || mGlobalActionsVisible;

            mNavigationLight =

                    ((mHasLightNavigationBar && !darkForScrim) || lightForScrim) && !darkForTop;
@@ -276,6 +281,11 @@ public class LightBarControllerImpl implements 
        mNavbarColorManagedByIme = navbarColorManagedByIme;

    }



    private boolean isNightMode() {

        return (mContext.getResources().getConfiguration().uiMode

                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

    }

    

    @Override

    public void onNavigationBarModeChanged(int newBarMode) {

        mHasLightNavigationBar = isLight(mAppearance, newBarMode, APPEARANCE_LIGHT_NAVIGATION_BARS);