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

Commit 6c11cff9 authored by Matt Pietal's avatar Matt Pietal
Browse files

Controls on lockscreen 

Beginning of a test for displaying controls on the lock screen in a
dialog, and triggered from an afforance on the keyguard bottom area.

adb shell settings put global controls_lockscreen 1

Bug: 170729566
Test: manual
Change-Id: I101840f29b2f917acb822321c48eb9a692142399
parent 3c1e6998

packages/SystemUI/res/drawable/controls_dialog_bg.xml

0 → 100644
+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.

-->

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

       android:shape="rectangle">

    <solid android:color="?android:attr/colorBackgroundFloating" />

    <corners android:radius="@dimen/notification_corner_radius" />

</shape>

packages/SystemUI/res/layout/controls_in_dialog.xml

0 → 100644
+45 −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.

-->



<LinearLayout

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

    android:id="@+id/control_detail_root"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginVertical="@dimen/controls_activity_view_top_offset"

    android:layout_marginHorizontal="@dimen/controls_activity_view_side_offset"

    android:padding="8dp"

    android:orientation="vertical"

    android:background="@drawable/controls_dialog_bg">



  <com.android.systemui.globalactions.MinHeightScrollView

      android:layout_width="match_parent"

      android:layout_height="0dp"

      android:layout_weight="1"

      android:orientation="vertical"

      android:scrollbars="none">



    <LinearLayout

        android:id="@+id/global_actions_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:orientation="vertical"

        android:clipToPadding="false" />



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

</LinearLayout>

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+11 −0
Original line number Diff line number Diff line
@@ -81,6 +81,17 @@ 
        android:contentDescription="@string/accessibility_phone_button"

        android:tint="?attr/wallpaperTextColor" />



    <ImageView

        android:id="@+id/alt_left_button"

        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_width="@dimen/keyguard_affordance_width"

        android:layout_gravity="bottom|start"

        android:scaleType="center"

        android:tint="?attr/wallpaperTextColor"

        android:layout_marginStart="24dp"

        android:layout_marginBottom="48dp"

        android:visibility="gone" />



    <FrameLayout

        android:id="@+id/overlay_container"

        android:layout_width="match_parent"

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ 
    <color name="control_enabled_cool_foreground">@color/GM2_blue_300</color>

    <color name="control_thumbnail_tint">#33000000</color>

    <color name="control_thumbnail_shadow_color">@*android:color/black</color>

    <color name="controls_lockscreen_scrim">#AA000000</color>



    <!-- Docked misalignment message -->

    <color name="misalignment_text_color">#F28B82</color>

packages/SystemUI/res/values/dimens.xml

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


    <!-- Home Controls activity view detail panel-->

    <dimen name="controls_activity_view_top_offset">100dp</dimen>

    <dimen name="controls_activity_view_side_offset">12dp</dimen>

    <dimen name="controls_activity_view_text_size">17sp</dimen>

    <dimen name="controls_activity_view_corner_radius">@*android:dimen/config_bottomDialogCornerRadius</dimen>