commit 3b70c6c41af7ce53dce37eba434ebcc081a9c03d
author Stanley Wang <stanleytfwang@google.com> Wed Mar 03 12:06:14 2021 +0800
committer Stanley Wang <stanleytfwang@google.com> Thu Mar 04 15:08:18 2021 +0800
tree 7cdbdf9c60cd1ea9a485e6d745f31e12f5da242f
parent 0994940af2e3fbc9ee86bf36b54a75a747f7749b

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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d22a381..b672917 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -309,6 +309,7 @@
         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