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

Commit 4996602e authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Remove pieces of device entry flag - Final piece" into main

parents 43cb7dd4 33be6d82

packages/SystemUI/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -318,9 +318,6 @@ filegroup { 
        "tests/src/**/systemui/stylus/StylusUsiPowerStartableTest.kt",

        "tests/src/**/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt",

        "tests/src/**/keyguard/ClockEventControllerTest.kt",

        "tests/src/**/keyguard/LegacyLockIconViewControllerWithCoroutinesTest.kt",

        "tests/src/**/keyguard/LegacyLockIconViewControllerBaseTest.kt",

        "tests/src/**/keyguard/LegacyLockIconViewControllerTest.java",

        "tests/src/**/systemui/animation/TransitionAnimatorTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothAutoOnRepositoryTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothStateInteractorTest.kt",
@@ -417,7 +414,6 @@ filegroup { 
        "tests/src/**/systemui/stylus/StylusUsiPowerUiTest.kt",

        "tests/src/**/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt",

        "tests/src/**/keyguard/KeyguardUpdateMonitorTest.java",

        "tests/src/**/keyguard/LegacyLockIconViewControllerBaseTest.java",

        "tests/src/**/keyguard/CarrierTextManagerTest.java",

        "tests/src/**/systemui/ScreenDecorationsTest.java",

        "tests/src/**/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt",

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −6
Original line number Diff line number Diff line
@@ -128,12 +128,6 @@ 


    <include layout="@layout/dock_info_bottom_area_overlay" />



    <com.android.keyguard.LockIconView

        android:id="@+id/lock_icon_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content">

    </com.android.keyguard.LockIconView>



    <include

        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />

packages/SystemUI/res/layout/udfps_keyguard_view_legacy.xml

deleted100644 → 0
+0 −25
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.

  -->

<com.android.systemui.biometrics.UdfpsKeyguardViewLegacy

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

    android:id="@+id/udfps_animation_view_legacy"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <!-- Add fingerprint views here. See udfps_keyguard_view_internal.xml. -->



</com.android.systemui.biometrics.UdfpsKeyguardViewLegacy>

packages/SystemUI/res/layout/udfps_view.xml

deleted100644 → 0
+0 −31
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.

  -->

<com.android.systemui.biometrics.UdfpsView

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

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

    android:id="@+id/udfps_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    systemui:sensorTouchAreaCoefficient="1.0"

    android:contentDescription="@string/accessibility_fingerprint_label">



    <ViewStub

        android:id="@+id/animation_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



</com.android.systemui.biometrics.UdfpsView>

packages/SystemUI/src/com/android/keyguard/EmptyLockIconViewController.kt

+4 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.keyguard



import android.view.MotionEvent

import android.view.View

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.view.KeyguardRootView

import com.android.systemui.res.R
@@ -34,11 +35,10 @@ import javax.inject.Inject 
@SysUISingleton

class EmptyLockIconViewController

@Inject

constructor(

    private val keyguardRootView: Lazy<KeyguardRootView>,

) : LockIconViewController {

constructor(private val keyguardRootView: Lazy<KeyguardRootView>) : LockIconViewController {

    private val deviceEntryIconViewId = R.id.device_entry_icon_view

    override fun setLockIconView(lockIconView: LockIconView) {



    override fun setLockIconView(lockIconView: View) {

        // no-op

    }