Button that goes from app info details to app info
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:
@@ -16,13 +16,19 @@
|
||||
|
||||
package com.android.settings.applications;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.settings.AppHeader;
|
||||
|
||||
public abstract class AppInfoWithHeader extends AppInfoBase {
|
||||
|
||||
public static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
|
||||
|
||||
private boolean mCreated;
|
||||
|
||||
@Override
|
||||
@@ -35,6 +41,24 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
|
||||
mCreated = true;
|
||||
if (mPackageInfo == null) return;
|
||||
AppHeader.createAppHeader(this, mPackageInfo.applicationInfo.loadIcon(mPm),
|
||||
mPackageInfo.applicationInfo.loadLabel(mPm), null, 0);
|
||||
mPackageInfo.applicationInfo.loadLabel(mPm), getInfoIntent(this, mPackageName), 0);
|
||||
}
|
||||
|
||||
public static Intent getInfoIntent(Fragment fragment, String packageName) {
|
||||
Bundle args = fragment.getArguments();
|
||||
Intent intent = fragment.getActivity().getIntent();
|
||||
boolean showInfo = true;
|
||||
if (args != null && args.getBoolean(EXTRA_HIDE_INFO_BUTTON, false)) {
|
||||
showInfo = false;
|
||||
}
|
||||
if (intent != null && intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
|
||||
showInfo = false;
|
||||
}
|
||||
Intent infoIntent = null;
|
||||
if (showInfo) {
|
||||
infoIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
||||
infoIntent.setData(Uri.fromParts("package", packageName, null));
|
||||
}
|
||||
return infoIntent;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user