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

Unverified Commit 698c6130 authored by SagarMakhar's avatar SagarMakhar Committed by Michael Bestas
Browse files

Adapt tuner prefs to S settings style & cleanup 



Co-authored-by: default avatarMichael Bestas <mkbestas@lineageos.org>
Change-Id: Icadd13a00e4d3e649b50f405ed0c8c76081be200
parent 4d189514

packages/SystemUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ 
        <activity android:name=".tuner.TunerActivity"

                  android:enabled="false"

                  android:icon="@drawable/tuner"

                  android:theme="@style/TunerSettings"

                  android:theme="@style/Theme.SubSettingsBase"

                  android:label="@string/system_ui_tuner"

                  android:process=":tuner"

                  android:exported="true">
@@ -449,7 +449,7 @@ 
        <activity-alias android:name=".DemoMode"

                  android:targetActivity=".tuner.TunerActivity"

                  android:icon="@drawable/tuner"

                  android:theme="@style/TunerSettings"

                  android:theme="@style/Theme.SubSettingsBase"

                  android:label="@string/demo_mode"

                  android:process=":tuner"

                  android:exported="true">

packages/SystemUI/LineageManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
            android:name=".tuner.StatusBarTuner"

            android:targetActivity=".tuner.TunerActivity"

            android:icon="@drawable/tuner"

            android:theme="@style/TunerSettings"

            android:label="@string/status_bar"

            android:theme="@style/Theme.SubSettingsBase"

            android:label="@string/status_bar_icons_title"

            android:process=":tuner"

            android:exported="true">

            <intent-filter>

packages/SystemUI/res/layout/tuner_activity.xml

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

    android:layout_height="match_parent"

    android:orientation="vertical">

    <Toolbar

        android:id="@+id/action_bar"

        style="?android:attr/actionBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:theme="?android:attr/actionBarTheme"

        android:navigationContentDescription="@*android:string/action_bar_up_description" />

    <FrameLayout

        android:id="@+id/content_frame"

        android:layout_width="match_parent"

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
 */

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Status bar - icons -->

    <string name="status_bar_icons_title">Status bar icons</string>



    <!-- Name of the clock in status bar [CHAR LIMIT=30] -->

    <string name="clock">Clock</string>

packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java

+0 −13
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.view.MenuItem;



import androidx.preference.Preference;

import androidx.preference.Preference.OnPreferenceChangeListener;
@@ -87,18 +86,6 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference 
        mDemoModeTracker.startTracking();

        updateDemoModeEnabled();

        updateDemoModeOn();



        setHasOptionsMenu(true);

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case android.R.id.home:

                getFragmentManager().popBackStack();

                break;

        }

        return super.onOptionsItemSelected(item);

    }



    @Override