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

Commit a70b5972 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "SystemUI: remove unused code that showed radio status in CryptKeeper... 

Merge "SystemUI: remove unused code that showed radio status in CryptKeeper mode" into tm-qpr-dev am: f7347b49

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21059686



Change-Id: I2b34efef454fadc8f31eda22c0a0007909893cdd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 039ec556 f7347b49

packages/SystemUI/res/layout/emergency_cryptkeeper_text.xml

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

<!--

  ~ Copyright (C) 2016 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.statusbar.policy.EmergencyCryptkeeperText

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

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:paddingStart="6dp"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:gravity="center_vertical|start"

        />
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar.xml

+0 −7
Original line number Diff line number Diff line
@@ -149,11 +149,4 @@ 
        </FrameLayout>

    </LinearLayout>



    <ViewStub

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout="@layout/emergency_cryptkeeper_text"

    />



</com.android.systemui.statusbar.phone.PhoneStatusBarView>

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkController.java

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public interface NetworkController extends CallbackController<SignalCallback>, D 
    void addEmergencyListener(EmergencyListener listener);

    /** */

    void removeEmergencyListener(EmergencyListener listener);

    /** */

    boolean hasEmergencyCryptKeeperText();



    /** */

    boolean isRadioOn();

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import com.android.systemui.statusbar.policy.DataSaverController; 
import com.android.systemui.statusbar.policy.DataSaverControllerImpl;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;

import com.android.systemui.statusbar.policy.EncryptionHelper;

import com.android.systemui.telephony.TelephonyListenerManager;

import com.android.systemui.util.CarrierConfigTracker;
@@ -1485,11 +1484,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        return info;

    }



    /** */

    public boolean hasEmergencyCryptKeeperText() {

        return EncryptionHelper.IS_DATA_ENCRYPTED;

    }



    /** */

    public boolean isRadioOn() {

        return !mAirplaneMode;

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.NotificationShelfController;

import com.android.systemui.statusbar.OperatorNameViewController;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.core.StatusBarInitializer.OnStatusBarViewInitializedListener;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;
@@ -293,7 +292,6 @@ public abstract class StatusBarViewModule { 
            StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,

            KeyguardStateController keyguardStateController,

            NotificationPanelViewController notificationPanelViewController,

            NetworkController networkController,

            StatusBarStateController statusBarStateController,

            CommandQueue commandQueue,

            CarrierConfigTracker carrierConfigTracker,
@@ -315,7 +313,6 @@ public abstract class StatusBarViewModule { 
                statusBarHideIconsForBouncerManager,

                keyguardStateController,

                notificationPanelViewController,

                networkController,

                statusBarStateController,

                commandQueue,

                carrierConfigTracker,