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

Commit 3b70c6c4 authored by Stanley Wang's avatar Stanley Wang
Browse files

Fix the overlap issue of MainSwitch and list view. 

This issue happen on Developer and Wi-Fi pages, so the problem
should be solved on SettingsActivity.

Fix: 181341927
Test: Run robotest and see the ui
Change-Id: I57722cfcbeb6390c88101d808429346045e57c92
parent 0994940a

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());