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

Make android.settings.SETTINGS intent go into homepage.

Browse Source 
Change-Id: Ib7453a79a473410c44bdcf06019446cedd34f837
Fixes: 117281845
Test: robotests
This commit is contained in:
Fan Zhang
2018-10-26 13:40:38 -07:00
parent 416ff0ab91
commit 0c7c59f1b9
5 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SettingsActivity.java
View File

@@ -16,8 +16,6 @@
package com.android.settings;
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
import android.app.ActionBar;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
@@ -248,10 +246,8 @@ public class SettingsActivity extends SettingsBaseActivity
// Getting Intent properties can only be done after the super.onCreate(...)
final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
final ComponentName cn = intent.getComponent();
final String className = cn.getClassName();
mIsShowingDashboard = className.equals(Settings.class.getName());
mIsShowingDashboard = TextUtils.equals(
SettingsActivity.class.getName(), intent.getComponent().getClassName());
// This is a "Sub Settings" when:
// - this is a real SubSettings

11
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.homepage;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.FeatureFlagUtils;
@@ -27,6 +26,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
@@ -38,9 +38,8 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!isDynamicHomepageEnabled(this)) {
final Intent settings = new Intent();
settings.setAction("android.settings.SETTINGS");
if (!FeatureFlagUtils.isEnabled(this, FeatureFlags.DYNAMIC_HOMEPAGE)) {
final Intent settings = new Intent(this, SettingsActivity.class);
startActivity(settings);
finish();
return;
@@ -56,10 +55,6 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
showFragment(new TopLevelSettings(), R.id.main_content);
}
public static boolean isDynamicHomepageEnabled(Context context) {
return FeatureFlagUtils.isEnabled(context, FeatureFlags.DYNAMIC_HOMEPAGE);
}
private void showFragment(Fragment fragment, int id) {
final FragmentManager fragmentManager = getSupportFragmentManager();
final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();