Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4d839e3 authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev

parents 41a72930 3b70c6c4

src/com/android/settings/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ public class SettingsActivity extends SettingsBaseActivity 
        mMainSwitch = findViewById(R.id.switch_bar);

        if (mMainSwitch != null) {

            mMainSwitch.setMetricsTag(getMetricsTag());

            mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);

        }



        // see if we should show Back/Next buttons

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -200,8 +200,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();

        mSwitchBar.setTitle(getContext().getString(R.string.developer_options_main_switch_title));

        mSwitchBar.show();

        mSwitchBar.setTranslationZ(

                getActivity().findViewById(R.id.main_content).getTranslationZ() + 1);

        mSwitchBarController = new DevelopmentSwitchBarController(

                this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,

                getSettingsLifecycle());