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

Commit 4ed2e207 authored by kwaky's avatar kwaky
Browse files

Implement AAOS-specific KeyguardViewController and decouple keyguard from statusbar. 

Bug: 150162295
Bug: 150164054
Test: Manual. Unit Tests Pending.
Change-Id: I66586e15d114eb6da55254f778511bde4fce3154
parent 09c3427e

packages/CarSystemUI/res-keyguard/layout/keyguard_bouncer.xml

+5 −6
Original line number Diff line number Diff line
@@ -29,4 +29,3 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />

</FrameLayout>
 
 No newline at end of file

packages/CarSystemUI/res-keyguard/layout/keyguard_container.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2020 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.

  -->



<!-- Car customizations

     Car has solid black background instead of a transparent one

-->

<LinearLayout

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

    android:id="@+id/keyguard_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center"/>
 
 No newline at end of file

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/fullscreen_user_switcher"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:background="@color/car_user_switcher_background_color">



    <LinearLayout

        android:id="@+id/container"

packages/CarSystemUI/res/layout/sysui_overlay_window.xml

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ 
              android:layout="@layout/notification_panel_container"

              android:layout_marginBottom="@dimen/navigation_bar_height"/>



    <ViewStub android:id="@+id/keyguard_stub"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:layout="@layout/keyguard_container" />



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

packages/CarSystemUI/res/values/config.xml

+2 −1
Original line number Diff line number Diff line
@@ -71,8 +71,9 @@ 


    <!-- Car System UI's OverlayViewsMediator-->

    <string-array name="config_carSystemUIOverlayViewsMediators" translatable="false">

        <item>com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator</item>

        <item>com.android.systemui.car.notification.NotificationPanelViewMediator</item>

        <item>com.android.systemui.car.keyguard.CarKeyguardViewMediator</item>

        <item>com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator</item>

    </string-array>



    <!-- SystemUI Services: The classes of the stuff to start. -->