PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Button that goes from app info details to app info

Browse Source 
This info button is shown on the header of all app detail pages.
This button is hidden when coming from app info, to avoid allowing
users to go in circles.

Since app notification details had a settings button where the new
info button goes, the app notification settings will move down to
be a preference (this matches the usage access screen UX).

Also fix a bug in launching app notification settings for managed
profiles.

Bug: 20633669
Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0
This commit is contained in:
Jason Monk
2015-05-08 15:03:14 -04:00
parent 59de14e219
commit 8f600a4fbc
10 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -29,6 +29,7 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.SwitchPreference;
import android.provider.Settings;
import android.text.TextUtils;
@@ -42,6 +43,7 @@ import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.notification.NotificationBackend.AppRow;
import java.util.List;
@@ -55,6 +57,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
private static final String KEY_PRIORITY = "priority";
private static final String KEY_PEEKABLE = "peekable";
private static final String KEY_SENSITIVE = "sensitive";
private static final String KEY_APP_SETTINGS = "app_settings";
static final String EXTRA_HAS_SETTINGS_INTENT = "has_settings_intent";
static final String EXTRA_SETTINGS_INTENT = "settings_intent";
@@ -85,7 +88,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
mCreated = true;
if (mAppRow == null) return;
AppHeader.createAppHeader(this, mAppRow.icon, mAppRow.label,
mAppRow.settingsIntent);
AppInfoWithHeader.getInfoIntent(this, mAppRow.pkg));
}
@Override
@@ -189,6 +192,19 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
return mBackend.setSensitive(pkg, uid, sensitive);
}
});
if (mAppRow.settingsIntent != null) {
findPreference(KEY_APP_SETTINGS).setOnPreferenceClickListener(
new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
mContext.startActivity(mAppRow.settingsIntent);
return true;
}
});
} else {
removePreference(KEY_APP_SETTINGS);
}
}
private void updateDependents(boolean banned) {