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

Commit 78e42f77 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

[DO NOT MERGE] Add placeholder for info panel in new power menu

Test: manual
Test: atest GlobalActionsInfoProviderTest
Bug: 183032541

Change-Id: I4440cebce458df60270b9133523e853249c281f7
parent 433ba6df
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 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.
  -->
<ImageView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/global_actions_change_button"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"/>
+9 −5
Original line number Diff line number Diff line
@@ -13,13 +13,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
    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"
    android:orientation="vertical"
    android:gravity="center"
    android:layout_gravity="center">
  <com.android.systemui.globalactions.GlobalActionsLayoutLite
@@ -29,8 +28,11 @@
      android:orientation="vertical"
      android:clipChildren="false"
      android:clipToPadding="false"
      android:background="@drawable/global_actions_lite_background"
      android:padding="@dimen/global_actions_lite_padding">
      app:layout_constraintBottom_toBottomOf="parent"
      app:layout_constraintTop_toTopOf="parent"
      app:layout_constraintStart_toStartOf="parent"
      app:layout_constraintEnd_toEndOf="parent"
      android:layout_weight="1">
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -38,6 +40,8 @@
        android:gravity="center"
        android:translationZ="@dimen/global_actions_translate"
        android:orientation="horizontal"
        android:background="@drawable/global_actions_lite_background"
        android:padding="@dimen/global_actions_lite_padding"
        android:layoutDirection="ltr">
      <androidx.constraintlayout.helper.widget.Flow
          android:id="@+id/list_flow"
@@ -53,4 +57,4 @@
          app:flow_horizontalStyle="packed"/>
    </androidx.constraintlayout.widget.ConstraintLayout>
  </com.android.systemui.globalactions.GlobalActionsLayoutLite>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
+2 −0
Original line number Diff line number Diff line
@@ -603,6 +603,8 @@

    <!-- Whether wallet view is shown in landscape / seascape orientations -->
    <bool name="global_actions_show_landscape_wallet_view">false</bool>
    <!-- Whether global actions should show an informational message about changes in S -->
    <bool name="global_actions_show_change_info">false</bool>

    <!-- Package name of the preferred system app to perform eSOS action -->
    <string name="config_preferredEmergencySosPackage" translatable="false"></string>
+1 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,7 @@
    <dimen name="global_actions_button_padding">38dp</dimen>
    <dimen name="global_actions_corner_radius">28dp</dimen>
    <dimen name="global_actions_lite_padding">24dp</dimen>
    <dimen name="global_actions_info_margin">32dp</dimen>

    <!-- The maximum offset in either direction that elements are moved horizontally to prevent
         burn-in on AOD. -->
+3 −0
Original line number Diff line number Diff line
@@ -2966,4 +2966,7 @@

    <!-- Content description for a chip in the status bar showing that the user is currently on a phone call. [CHAR LIMIT=NONE] -->
    <string name="ongoing_phone_call_content_description">Ongoing phone call</string>

    <!-- URL for more information about changes in global actions -->
    <string name="global_actions_change_url" translatable="false"></string>
</resources>
Loading