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

src/com/android/settings/SettingsActivity.java

@@ -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

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