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

Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev

Browse Source
This commit is contained in:
Fan Zhang
2019-05-14 17:17:26 +00:00
committed by Android (Google) Code Review
parent ae6f6ab00a 9e98b8cf0f
commit 9a51ede665
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import androidx.annotation.Nullable;
@@ -50,6 +51,7 @@ import androidx.preference.PreferenceManager;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.backup.BackupSettingsHelper;
import com.android.settings.backup.UserBackupSettingsActivity;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.core.SettingsBaseActivity;
@@ -166,6 +168,8 @@ public class SettingsActivity extends SettingsBaseActivity
private Button mNextButton;
private ViewGroup mContent;
// Categories
private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
@@ -250,6 +254,8 @@ public class SettingsActivity extends SettingsBaseActivity
setContentView(R.layout.settings_main_prefs);
mContent = findViewById(R.id.main_content);
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedState != null) {