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

Commit b93024f1 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Remove dead code #10: Clean up PhoneStatusBar 

- Remove carrier label
- Remove emergency calls only label
- Remove dead methods and fiels.

Change-Id: If242a8fa926d21d77fc54867f4244e7d82626fff
parent 2325f276

packages/SystemUI/res/layout-sw600dp/carrier_label.xml

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

<!--

/*

** Copyright 2012, 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.

*/

-->



<Space

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

    android:visibility="gone"

    />
 
 No newline at end of file

packages/SystemUI/res/layout/carrier_label.xml

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

<!--

/*

** Copyright 2012, 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.

*/

-->



<TextView

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

    android:id="@+id/carrier_label"

    android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network"

    android:layout_height="@dimen/carrier_label_height"

    android:layout_width="match_parent"

    android:layout_gravity="bottom"

    android:layout_marginBottom="@dimen/close_handle_height"

    android:gravity="center"

    android:visibility="invisible"

    />
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −18
Original line number Diff line number Diff line
@@ -27,29 +27,11 @@ 
    android:background="@android:color/transparent"

    >



    <include

        layout="@layout/carrier_label"

        android:layout_height="@dimen/carrier_label_height"

        android:layout_width="match_parent"

        android:layout_marginBottom="@dimen/close_handle_height"

        android:layout_gravity="bottom"

        />



    <include

        layout="@layout/keyguard_status_view"

        android:layout_height="wrap_content"

        android:visibility="gone" />



    <TextView

        android:id="@+id/emergency_calls_only"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network.EmergencyOnly"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:padding="4dp"

        android:gravity="center"

        android:visibility="gone"

        />



    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/SystemUI/res/values/styles.xml

+0 −7
Original line number Diff line number Diff line
@@ -109,13 +109,6 @@ 
    <style name="TextAppearance.StatusBar.Expanded.ChargingInfo"

            parent="TextAppearance.StatusBar.Expanded.AboveDateTime" />



    <style name="TextAppearance.StatusBar.Expanded.Network" parent="@style/TextAppearance.StatusBar.Expanded.Date">

        <item name="android:textColor">#999999</item>

	</style>



    <style name="TextAppearance.StatusBar.Expanded.Network.EmergencyOnly">

    </style>



    <style name="TextAppearance.StatusBar.Expanded.UserSwitcher">

        <item name="android:textSize">16sp</item>

        <item name="android:textStyle">normal</item>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+0 −5
Original line number Diff line number Diff line
@@ -137,9 +137,6 @@ public abstract class BaseStatusBar extends SystemUI implements 
    // Should match the value in PhoneWindowManager

    public static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps";



    public static final int EXPANDED_LEAVE_ALONE = -10000;

    public static final int EXPANDED_FULL_OPEN = -10001;



    private static final String BANNER_ACTION_CANCEL =

            "com.android.systemui.statusbar.banner_action_cancel";

    private static final String BANNER_ACTION_SETUP =
@@ -1810,7 +1807,6 @@ public abstract class BaseStatusBar extends SystemUI implements 


    protected abstract void setAreThereNotifications();

    protected abstract void updateNotifications();

    protected abstract void updateExpandedViewPos(int expandedPosition);

    protected abstract boolean shouldDisableNavbarGestures();



    public abstract void addNotification(StatusBarNotification notification,
@@ -2002,7 +1998,6 @@ public abstract class BaseStatusBar extends SystemUI implements 


        // Recalculate the position of the sliding windows and the titles.

        setAreThereNotifications();

        updateExpandedViewPos(EXPANDED_LEAVE_ALONE);

    }



    private void updateNotificationViews(NotificationData.Entry entry,