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

Commit 0bbdaa7d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show lock message in Global Actions" into rvc-dev am: 315edf11 

Change-Id: I72f3c2509f1da7cf8ac38bbfaacb73da5037c085
parents 921a74d9 315edf11

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+29 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/global_actions_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -43,39 +44,50 @@ 
    </LinearLayout>

  </com.android.systemui.globalactions.GlobalActionsFlatLayout>



  <androidx.constraintlayout.widget.ConstraintLayout

      android:id="@+id/global_actions_lock_message_container"

      android:layout_width="match_parent"

      android:layout_height="match_parent"

      android:visibility="gone">

    <TextView

        android:id="@+id/global_actions_lock_message"

        style="@style/TextAppearance.Control.Title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="@dimen/global_actions_side_margin"

        android:drawablePadding="12dp"

        android:gravity="center"

        android:text="@string/global_action_lock_message"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_bias="0.35"/>

  </androidx.constraintlayout.widget.ConstraintLayout>



  <com.android.systemui.globalactions.MinHeightScrollView

      android:layout_width="match_parent"

      android:layout_height="match_parent"

      android:orientation="vertical"

      android:scrollbars="none"

  >

      android:scrollbars="none">



    <LinearLayout

        android:id="@+id/global_actions_grid_root"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:orientation="vertical"

        android:clipToPadding="false"

    >

      <LinearLayout

          android:id="@+id/global_actions_panel"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:orientation="vertical"

      >

        android:clipToPadding="false">



      <FrameLayout

            android:id="@+id/global_actions_panel_container"

          android:id="@+id/global_actions_wallet"

          android:layout_width="match_parent"

            android:layout_height="wrap_content"

        />

      </LinearLayout>

          android:layout_height="wrap_content"/>



      <LinearLayout

          android:id="@+id/global_actions_controls"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:orientation="vertical"

      />

          android:orientation="vertical"/>



    </LinearLayout>

  </com.android.systemui.globalactions.MinHeightScrollView>

</LinearLayout>

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,9 @@ 
    <!-- Amount to shift the layout when exiting/entering for controls activities -->

    <dimen name="global_actions_controls_y_translation">20dp</dimen>



    <!-- Shift quick access wallet down in Global Actions when Controls are unavailable -->

    <dimen name="global_actions_wallet_top_margin">40dp</dimen>



    <!-- The maximum offset in either direction that elements are moved horizontally to prevent

         burn-in on AOD. -->

    <dimen name="burn_in_prevention_offset_x">8dp</dimen>

packages/SystemUI/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -212,6 +212,13 @@ 
    <!-- Power menu item for taking a screenshot [CHAR LIMIT=20]-->

    <string name="global_action_screenshot">Screenshot</string>



    <!-- Text shown when viewing global actions while phone is locked and additional controls are hidden [CHAR LIMIT=NONE] -->

    <string name="global_action_lock_message" product="default">Unlock your phone for more options</string>

    <!-- Text shown when viewing global actions while phone is locked and additional controls are hidden [CHAR LIMIT=NONE] -->

    <string name="global_action_lock_message" product="tablet">Unlock your tablet for more options</string>

    <!-- Text shown when viewing global actions while phone is locked and additional controls are hidden [CHAR LIMIT=NONE] -->

    <string name="global_action_lock_message" product="device">Unlock your device for more options</string>



    <!-- text to show in place of RemoteInput images when they cannot be shown.

         [CHAR LIMIT=50] -->

    <string name="remote_input_image_insertion_text">sent an image</string>

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+123 −146

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
    private final Lazy<GlobalActionsDialog> mGlobalActionsDialogLazy;

    private final KeyguardStateController mKeyguardStateController;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final ExtensionController.Extension<GlobalActionsPanelPlugin> mPanelExtension;

    private final ExtensionController.Extension<GlobalActionsPanelPlugin> mWalletPluginProvider;

    private final BlurUtils mBlurUtils;

    private final CommandQueue mCommandQueue;

    private GlobalActionsDialog mGlobalActionsDialog;
@@ -69,7 +69,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
        mCommandQueue = commandQueue;

        mBlurUtils = blurUtils;

        mCommandQueue.addCallback(this);

        mPanelExtension = Dependency.get(ExtensionController.class)

        mWalletPluginProvider = Dependency.get(ExtensionController.class)

                .newExtension(GlobalActionsPanelPlugin.class)

                .withPlugin(GlobalActionsPanelPlugin.class)

                .build();
@@ -90,7 +90,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
        mGlobalActionsDialog = mGlobalActionsDialogLazy.get();

        mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(),

                mDeviceProvisionedController.isDeviceProvisioned(),

                mPanelExtension.get());

                mWalletPluginProvider.get());

        Dependency.get(KeyguardUpdateMonitor.class).requestFaceAuth();

    }