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

Merge "Fix intent tile to unlock on launching activities" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-19 18:28:56 +00:00
committed by Android (Google) Code Review
parent 6983752a10 ee43cdfa43
commit cdca13c613
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -390,7 +390,7 @@ public class QSPanel extends ViewGroup {
mDetailSettingsButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mHost.startSettingsActivity(settingsIntent);
mHost.startActivityDismissingKeyguard(settingsIntent);
}
});

2
packages/SystemUI/src/com/android/systemui/qs/QSTile.java
View File

@@ -306,7 +306,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
}
public interface Host {
void startSettingsActivity(Intent intent);
void startActivityDismissingKeyguard(Intent intent);
void warn(String message, Throwable t);
void collapsePanels();
Looper getLooper();

2
packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
View File

@@ -82,7 +82,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
if (mDataController.isMobileDataSupported()) {
showDetail(true);
} else {
mHost.startSettingsActivity(CELLULAR_SETTINGS);
mHost.startActivityDismissingKeyguard(CELLULAR_SETTINGS);
}
}

2
packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
View File

@@ -263,7 +263,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> {
private final ZenModePanel.Callback mZenModePanelCallback = new ZenModePanel.Callback() {
@Override
public void onPrioritySettings() {
mHost.startSettingsActivity(ZEN_PRIORITY_SETTINGS);
mHost.startActivityDismissingKeyguard(ZEN_PRIORITY_SETTINGS);
}
@Override

6
packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java
View File

@@ -96,7 +96,11 @@ public class IntentTile extends QSTile<QSTile.State> {
private void sendIntent(String type, PendingIntent pi, String uri) {
try {
if (pi != null) {
pi.send();
if (pi.isActivity()) {
getHost().startActivityDismissingKeyguard(pi.getIntent());
} else {
pi.send();
}
} else if (uri != null) {
final Intent intent = Intent.parseUri(uri, Intent.URI_INTENT_SCHEME);
mContext.sendBroadcastAsUser(intent, new UserHandle(mCurrentUserId));

4
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
View File

@@ -104,7 +104,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
@Override
protected void handleSecondaryClick() {
if (!mWifiController.canConfigWifi()) {
mHost.startSettingsActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
mHost.startActivityDismissingKeyguard(new Intent(Settings.ACTION_WIFI_SETTINGS));
return;
}
if (!mState.enabled) {
@@ -290,7 +290,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
@Override
public void onSettingsActivityTriggered(Intent settingsIntent) {
mHost.startSettingsActivity(settingsIntent);
mHost.startActivityDismissingKeyguard(settingsIntent);
}
@Override

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

@@ -3101,16 +3101,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
|| (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;
}
public void postStartSettingsActivity(final Intent intent, int delay) {
public void postStartActivityDismissingKeyguard(final Intent intent, int delay) {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
handleStartSettingsActivity(intent, true /*onlyProvisioned*/);
handleStartActivityDismissingKeyguard(intent, true /*onlyProvisioned*/);
}
}, delay);
}
private void handleStartSettingsActivity(Intent intent, boolean onlyProvisioned) {
private void handleStartActivityDismissingKeyguard(Intent intent, boolean onlyProvisioned) {
startActivityDismissingKeyguard(intent, onlyProvisioned, true /* dismissShade */);
}

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

@@ -129,8 +129,8 @@ public class QSTileHost implements QSTile.Host, Tunable {
}
@Override
public void startSettingsActivity(final Intent intent) {
mStatusBar.postStartSettingsActivity(intent, 0);
public void startActivityDismissingKeyguard(final Intent intent) {
mStatusBar.postStartActivityDismissingKeyguard(intent, 0);
}
@Override