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

Commit 8b901734 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Remove unused variable 'screenon'"

parents ace4e33c d002a0a9

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+6 −9
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;
@@ -202,8 +201,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);

        filter.addAction(Intent.ACTION_SCREEN_ON);

        getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);

        PowerManager pm = getContext().getSystemService(PowerManager.class);

        notifyNavigationBarScreenOn(pm.isScreenOn());

        notifyNavigationBarScreenOn();

    }



    @Override
@@ -378,8 +376,8 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
                ((View) mNavigationBarView.getParent()).getLayoutParams());

    }



    private void notifyNavigationBarScreenOn(boolean screenOn) {

        mNavigationBarView.notifyScreenOn(screenOn);

    private void notifyNavigationBarScreenOn() {

        mNavigationBarView.notifyScreenOn();

    }



    private void prepareNavigationBarView() {
@@ -659,10 +657,9 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (Intent.ACTION_SCREEN_OFF.equals(action)) {

                notifyNavigationBarScreenOn(false);

            } else if (Intent.ACTION_SCREEN_ON.equals(action)) {

                notifyNavigationBarScreenOn(true);

            if (Intent.ACTION_SCREEN_OFF.equals(action)

                    || Intent.ACTION_SCREEN_ON.equals(action)) {

                notifyNavigationBarScreenOn();

            }

        }

    };

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+1 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    View[] mRotatedViews = new View[4];



    boolean mVertical;

    boolean mScreenOn;

    private int mCurrentRotation = -1;



    boolean mShowMenu;
@@ -367,8 +366,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        super.setLayoutDirection(layoutDirection);

    }



    public void notifyScreenOn(boolean screenOn) {

        mScreenOn = screenOn;

    public void notifyScreenOn() {

        setDisabledFlags(mDisabledFlags, true);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+0 −4
Original line number Diff line number Diff line
@@ -99,14 +99,11 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.SystemService;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.Vibrator;

import android.provider.Settings;

import android.service.dreams.DreamService;

import android.service.dreams.IDreamManager;

import android.service.notification.NotificationListenerService;

import android.service.notification.NotificationListenerService.RankingMap;

import android.service.notification.StatusBarNotification;
@@ -120,7 +117,6 @@ import android.util.Log; 
import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseBooleanArray;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.IWindowManager;

import android.view.KeyEvent;