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

Allow returning from quick settings on lockscreen

Browse Source 
Turns out having to switch off the device to get back to notifications
is annoying.

Bug: 13635952
Change-Id: I9db81370c7c715a0874e2b6a4d75ed408843868a
This commit is contained in:
Adrian Roos
2014-04-10 00:44:43 +02:00
parent 770f9f813f
commit 3bc62f724b
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2804,6 +2804,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
}
mKeyguardSettingsFlipButton.setVisibility(View.VISIBLE);
mKeyguardSettingsFlipButton.findViewById(R.id.settings_button).setVisibility(View.VISIBLE);
mKeyguardSettingsFlipButton.findViewById(R.id.notification_button)
.setVisibility(View.INVISIBLE);
updateRowStates();
}
@@ -2849,24 +2851,38 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
}
private void installSettingsButton(View parent) {
ImageView settingsButton = (ImageView) mStatusBarWindow.findViewById(R.id.settings_button);
final ImageView settingsButton =
(ImageView) mStatusBarWindow.findViewById(R.id.settings_button);
final ImageView notificationButton =
(ImageView) mStatusBarWindow.findViewById(R.id.notification_button);
if (settingsButton != null) {
settingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
animateExpandSettingsPanel();
v.setVisibility(View.INVISIBLE);
notificationButton.setVisibility(View.VISIBLE);
}
});
settingsButton.setVisibility(View.VISIBLE);
if (mHasSettingsPanel) {
// the settings panel is hiding behind this button
settingsButton.setImageResource(R.drawable.ic_notify_quicksettings);
settingsButton.setVisibility(View.VISIBLE);
} else {
// no settings panel, go straight to settings
settingsButton.setVisibility(View.VISIBLE);
settingsButton.setImageResource(R.drawable.ic_notify_settings);
}
}
if (notificationButton != null) {
notificationButton.setVisibility(View.INVISIBLE);
notificationButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
flipToNotifications();
v.setVisibility(View.INVISIBLE);
settingsButton.setVisibility(View.VISIBLE);
}
});
}
}
}