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

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

Browse Source 
* commit 'cdca13c613d3a8c9c8d7f4c9c29f4cb47d1bdb8d':
  Fix intent tile to unlock on launching activities
This commit is contained in:
Jason Monk
2015-06-19 18:35:51 +00:00
committed by Android Git Automerger
parent e497455f63 cdca13c613
commit 942277508f
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() { mDetailSettingsButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { 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 { public interface Host {
void startSettingsActivity(Intent intent); void startActivityDismissingKeyguard(Intent intent);
void warn(String message, Throwable t); void warn(String message, Throwable t);
void collapsePanels(); void collapsePanels();
Looper getLooper(); 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()) { if (mDataController.isMobileDataSupported()) {
showDetail(true); showDetail(true);
} else { } 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() { private final ZenModePanel.Callback mZenModePanelCallback = new ZenModePanel.Callback() {
@Override @Override
public void onPrioritySettings() { public void onPrioritySettings() {
mHost.startSettingsActivity(ZEN_PRIORITY_SETTINGS); mHost.startActivityDismissingKeyguard(ZEN_PRIORITY_SETTINGS);
} }
@Override @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) { private void sendIntent(String type, PendingIntent pi, String uri) {
try { try {
if (pi != null) { if (pi != null) {
pi.send(); if (pi.isActivity()) {
getHost().startActivityDismissingKeyguard(pi.getIntent());
} else {
pi.send();
}
} else if (uri != null) { } else if (uri != null) {
final Intent intent = Intent.parseUri(uri, Intent.URI_INTENT_SCHEME); final Intent intent = Intent.parseUri(uri, Intent.URI_INTENT_SCHEME);
mContext.sendBroadcastAsUser(intent, new UserHandle(mCurrentUserId)); 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 @Override
protected void handleSecondaryClick() { protected void handleSecondaryClick() {
if (!mWifiController.canConfigWifi()) { if (!mWifiController.canConfigWifi()) {
mHost.startSettingsActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)); mHost.startActivityDismissingKeyguard(new Intent(Settings.ACTION_WIFI_SETTINGS));
return; return;
} }
if (!mState.enabled) { if (!mState.enabled) {
@@ -290,7 +290,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
@Override @Override
public void onSettingsActivityTriggered(Intent settingsIntent) { public void onSettingsActivityTriggered(Intent settingsIntent) {
mHost.startSettingsActivity(settingsIntent); mHost.startActivityDismissingKeyguard(settingsIntent);
} }
@Override @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; || (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() { mHandler.postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
handleStartSettingsActivity(intent, true /*onlyProvisioned*/); handleStartActivityDismissingKeyguard(intent, true /*onlyProvisioned*/);
} }
}, delay); }, delay);
} }
private void handleStartSettingsActivity(Intent intent, boolean onlyProvisioned) { private void handleStartActivityDismissingKeyguard(Intent intent, boolean onlyProvisioned) {
startActivityDismissingKeyguard(intent, onlyProvisioned, true /* dismissShade */); 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 @Override
public void startSettingsActivity(final Intent intent) { public void startActivityDismissingKeyguard(final Intent intent) {
mStatusBar.postStartSettingsActivity(intent, 0); mStatusBar.postStartActivityDismissingKeyguard(intent, 0);
} }
@Override @Override