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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-15 00:01:30 +00:00
committed by Android (Google) Code Review
parent 5513a9bdd1 b4b7725937
commit 17521d0ac7
9 changed files with 166 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ 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;
@@ -51,7 +50,6 @@ 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;
@@ -168,8 +166,6 @@ public class SettingsActivity extends SettingsBaseActivity
private Button mNextButton;
private ViewGroup mContent;
// Categories
private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
@@ -254,8 +250,6 @@ public class SettingsActivity extends SettingsBaseActivity
setContentView(R.layout.settings_main_prefs);
mContent = findViewById(R.id.main_content);
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedState != null) {

3
src/com/android/settings/display/PreviewPagerAdapter.java
View File

@@ -67,7 +67,8 @@ public class PreviewPagerAdapter extends PagerAdapter {
mPreviewFrames[p].setLayoutParams(new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT));
mPreviewFrames[p].setClipToPadding(true);
mPreviewFrames[p].setClipChildren(true);
for (int j = 0; j < configurations.length; ++j) {
// Create a new configuration for the specified value. It won't
// have any theme set, so manually apply the current theme.

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

@@ -27,16 +27,16 @@ import android.widget.Toolbar;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
import com.android.settings.accounts.AvatarViewMixin;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.overlay.FeatureFactory;
public class SettingsHomepageActivity extends SettingsBaseActivity {
public class SettingsHomepageActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {