Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused variable 'screenon'"

Browse Source
This commit is contained in:
Siarhei Vishniakou
2017-06-06 15:39:50 +00:00
committed by Android (Google) Code Review
parent ace4e33ccb d002a0a96e
commit 8b9017346f
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}
};

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

@@ -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);
}

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

@@ -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;