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

Commit 82aa6c7e authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Expressive design] Update MainSwitch in SettingsActivity."" into main

parents 0553c761 63a14901

res/layout/settings_main_prefs.xml

+0 −7
Original line number Diff line number Diff line
@@ -28,13 +28,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



    <com.android.settings.widget.SettingsMainSwitchBar

        android:id="@+id/expressive_switch_bar"

        android:visibility="gone"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="16dip"/>



    <FrameLayout

        android:id="@+id/main_content"

        android:layout_width="match_parent"

src/com/android/settings/SettingsActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -311,10 +311,7 @@ public class SettingsActivity extends SettingsBaseActivity 
        }



        setContentView(R.layout.settings_main_prefs);



        mMainSwitch = SettingsThemeHelper.isExpressiveTheme(this)

                ? findViewById(R.id.expressive_switch_bar)

                : findViewById(R.id.switch_bar);

        mMainSwitch = findViewById(R.id.switch_bar);

        if (mMainSwitch != null) {

            mMainSwitch.setMetricsCategory(lookupMetricsCategory());

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