Merge "Pre-fixup for nav up button" (a33144b8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+29 −83

Original line number	Diff line number	Diff line
		@@ -82,8 +82,6 @@ public class SettingsActivity extends SettingsDrawerActivity

		// Constants for state save/restore
		private static final String SAVE_KEY_CATEGORIES = ":settings:categories";
		@VisibleForTesting
		static final String SAVE_KEY_SHOW_HOME_AS_UP = ":settings:show_home_as_up";

		/**
		* When starting this activity, the invoking Intent can contain this extra
		@@ -150,8 +148,6 @@ public class SettingsActivity extends SettingsDrawerActivity

		private static final String EXTRA_UI_OPTIONS = "settings:ui_options";

		private static final int REQUEST_SUGGESTION = 42;

		private String mFragmentClass;

		private CharSequence mInitialTitle;
		@@ -183,9 +179,6 @@ public class SettingsActivity extends SettingsDrawerActivity

		private Button mNextButton;

		@VisibleForTesting
		boolean mDisplayHomeAsUpEnabled;

		private boolean mIsShowingDashboard;
		private boolean mIsShortcut;

		@@ -197,7 +190,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		private ArrayList<DashboardCategory> mCategories = new ArrayList<>();

		private DashboardFeatureProvider mDashboardFeatureProvider;
		private ComponentName mCurrentSuggestion;

		public SwitchBar getSwitchBar() {
		return mSwitchBar;
		@@ -310,9 +302,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		mCategories.addAll(categories);
		setTitleFromBackStack();
		}

		mDisplayHomeAsUpEnabled = savedState.getBoolean(SAVE_KEY_SHOW_HOME_AS_UP);

		} else {
		launchSettingFragment(initialFragmentName, isSubSettings, intent);
		}
		@@ -337,8 +326,8 @@ public class SettingsActivity extends SettingsDrawerActivity

		ActionBar actionBar = getActionBar();
		if (actionBar != null) {
		actionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
		actionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
		actionBar.setDisplayHomeAsUpEnabled(true);
		actionBar.setHomeButtonEnabled(true);
		actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
		}
		mSwitchBar = findViewById(R.id.switch_bar);
		@@ -380,8 +369,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		String buttonText = intent.getStringExtra(EXTRA_PREFS_SET_NEXT_TEXT);
		if (TextUtils.isEmpty(buttonText)) {
		mNextButton.setVisibility(View.GONE);
		}
		else {
		} else {
		mNextButton.setText(buttonText);
		}
		}
		@@ -389,8 +377,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		String buttonText = intent.getStringExtra(EXTRA_PREFS_SET_BACK_TEXT);
		if (TextUtils.isEmpty(buttonText)) {
		backButton.setVisibility(View.GONE);
		}
		else {
		} else {
		backButton.setText(buttonText);
		}
		}
		@@ -408,14 +395,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		@VisibleForTesting
		void launchSettingFragment(String initialFragmentName, boolean isSubSettings, Intent intent) {
		if (!mIsShowingDashboard && initialFragmentName != null) {
		// UP will be shown only if it is a sub settings
		if (mIsShortcut) {
		mDisplayHomeAsUpEnabled = isSubSettings;
		} else if (isSubSettings) {
		mDisplayHomeAsUpEnabled = true;
		} else {
		mDisplayHomeAsUpEnabled = false;
		}
		setTitleFromIntent(intent);

		Bundle initialArguments = intent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
		@@ -423,7 +402,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		mInitialTitleResId, mInitialTitle, false);
		} else {
		// Show search icon as up affordance if we are displaying the main Dashboard
		mDisplayHomeAsUpEnabled = true;
		mInitialTitleResId = R.string.dashboard_title;

		switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
		@@ -509,15 +487,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		if (mCategories.size() > 0) {
		outState.putParcelableArrayList(SAVE_KEY_CATEGORIES, mCategories);
		}

		outState.putBoolean(SAVE_KEY_SHOW_HOME_AS_UP, mDisplayHomeAsUpEnabled);
		}

		@Override
		protected void onRestoreInstanceState(Bundle savedInstanceState) {
		super.onRestoreInstanceState(savedInstanceState);

		mDisplayHomeAsUpEnabled = savedInstanceState.getBoolean(SAVE_KEY_SHOW_HOME_AS_UP);
		}

		@Override
		@@ -940,29 +909,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		return mNextButton;
		}

		@Override
		public boolean shouldUpRecreateTask(Intent targetIntent) {
		return super.shouldUpRecreateTask(new Intent(this, SettingsActivity.class));
		}

		public void startSuggestion(Intent intent) {
		if (intent == null \|\| ActivityManager.isUserAMonkey()) {
		return;
		}
		mCurrentSuggestion = intent.getComponent();
		startActivityForResult(intent, REQUEST_SUGGESTION);
		}

		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		if (requestCode == REQUEST_SUGGESTION && mCurrentSuggestion != null
		&& resultCode != RESULT_CANCELED) {
		getPackageManager().setComponentEnabledSetting(mCurrentSuggestion,
		PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
		}
		super.onActivityResult(requestCode, resultCode, data);
		}

		@VisibleForTesting
		Bitmap getBitmapFromXmlResource(int drawableRes) {
		Drawable drawable = getResources().getDrawable(drawableRes, getTheme());

src/com/android/settings/backup/BackupSettingsHelper.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -24,13 +24,12 @@ import android.content.Intent;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.util.Log;

		import android.support.annotation.VisibleForTesting;
		import android.util.Log;

		import com.android.settings.R;
		import com.android.settings.Settings.PrivacySettingsActivity;
		import com.android.settingslib.drawer.SettingsDrawerActivity;

		import java.net.URISyntaxException;

		/**
		@@ -153,8 +152,7 @@ public class BackupSettingsHelper {

		private Intent getIntentForDefaultBackupSettings() {
		// Extra needed by {@link SettingsDrawerActivity} to show the back button navigation.
		return new Intent(mContext, PrivacySettingsActivity.class)
		.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
		return new Intent(mContext, PrivacySettingsActivity.class);
		}

		/**

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -33,21 +33,18 @@ import android.support.annotation.VisibleForTesting;
		import android.support.v7.preference.Preference;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.FeatureFlagUtils;
		import android.util.Log;
		import android.util.Pair;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
		import com.android.settingslib.drawer.CategoryManager;
		import com.android.settingslib.drawer.DashboardCategory;
		import com.android.settingslib.drawer.ProfileSelectDialog;
		import com.android.settingslib.drawer.SettingsDrawerActivity;
		import com.android.settingslib.drawer.Tile;
		import com.android.settingslib.drawer.TileUtils;
		import com.android.settingslib.utils.ThreadUtils;
		@@ -212,7 +209,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		final Intent intent = new Intent(tile.intent)
		.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
		MetricsEvent.DASHBOARD_SUMMARY)
		.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true)
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
		launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
		}

src/com/android/settings/deviceinfo/StorageSettings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
		Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
		StorageDashboardFragment.class.getName(), args, null,
		R.string.storage_settings, null, false, getMetricsCategory());
		intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
		getActivity().startActivity(intent);
		finish();
		}

src/com/android/settings/deviceinfo/storage/UserProfileController.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ public class UserProfileController extends AbstractPreferenceController implemen
		Intent intent = Utils.onBuildStartFragmentIntent(mContext,
		StorageProfileFragment.class.getName(), args, null, 0,
		mUser.name, false, MetricsProto.MetricsEvent.DEVICEINFO_STORAGE);
		intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
		mContext.startActivity(intent);
		return true;
		}