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

Commit 375d8bae authored by Silin Huang's avatar Silin Huang Committed by Automerger Merge Worker
Browse files

Merge "Add quick access wallet tile." into sc-dev am: 2b41d2ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13775537

Change-Id: Ifde6215a4b0854feb4d749b6609862789126cce4
parents 6303bb31 2b41d2ba
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,
    -0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"/>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@

    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
    <string name="quick_settings_tiles_stock" translatable="false">
        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,screenrecord,reverse,reduce_brightness,cameratoggle,mictoggle,controls,alarm
        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,screenrecord,reverse,reduce_brightness,cameratoggle,mictoggle,controls,alarm,wallet
    </string>

    <!-- The tiles to display in QuickSettings -->
+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@
    <!-- People Tile flag -->
    <bool name="flag_conversations">false</bool>

    <bool name="flag_wallet">false</bool>

    <!-- The new animations to/from lockscreen and AOD! -->
    <bool name="flag_lockscreen_animations">false</bool>

+6 −0
Original line number Diff line number Diff line
@@ -1621,6 +1621,12 @@
    <!-- Name of the alarm status bar icon. -->
    <string name="status_bar_alarm">Alarm</string>

    <!-- Wallet strings -->
    <!-- Wallet empty state, title [CHAR LIMIT=32] -->
    <string name="wallet_title">Wallet</string>
    <!-- Secondary label of the quick access wallet tile. [CHAR LIMIT=32] -->
    <string name="wallet_secondary_label">Ready</string>

    <!-- Name of the work status bar icon. -->
    <string name="status_bar_work">Work profile</string>

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.HandlerThread;
import android.os.Looper;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.service.quickaccesswallet.QuickAccessWalletClient;
import android.view.Choreographer;
import android.view.IWindowManager;
import android.view.LayoutInflater;
@@ -360,4 +361,11 @@ public class DependencyProvider {
    public ModeSwitchesController providesModeSwitchesController(Context context) {
        return new ModeSwitchesController(context);
    }

    /** */
    @Provides
    @SysUISingleton
    public QuickAccessWalletClient provideQuickAccessWalletClient(Context context) {
        return QuickAccessWalletClient.create(context);
    }
}
Loading