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

Unverified Commit f04ce5a2 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Michael Bestas
Browse files

SystemUI: Status bar tuner improvements 



* Split icon toggles to a separate page
* Remove deprecated TunerService usage
* Match theme with Settings
* Fix insets

Co-authored-by: default avatarGabriele M <moto.falcon.git@gmail.com>
Co-authored-by: default avatarIdo Ben-Hur <idoybh2@gmail.com>
Co-authored-by: default avatarMichael Bestas <mkbestas@lineageos.org>
Co-authored-by: default avatarOliver Scott <olivercscott@gmail.com>
Co-authored-by: default avatarSagarMakhar <sagarmakhar@gmail.com>
Co-authored-by: default avatarSteve Kondik <steve@cyngn.com>
Change-Id: Icc84575db18931d3a43bd9e640f2a55a51b460c1
parent b2cb619f

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ android_library { 
        "keepanno-annotations",

    ],

    manifest: "AndroidManifest.xml",

    additional_manifests: ["LineageManifest.xml"],



    javacflags: [

        "-Adagger.fastInit=enabled",

packages/SystemUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -564,7 +564,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">
@@ -581,7 +581,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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright (c) 2017 The LineageOS Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.systemui">



    <!-- SystemUI Tuner -->

    <application>

        <activity-alias

            android:name=".tuner.StatusBarTuner"

            android:targetActivity=".tuner.TunerActivity"

            android:icon="@drawable/tuner"

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

            android:label="@string/status_bar_icons_title"

            android:process=":tuner"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.settings.action.STATUS_BAR_TUNER" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity-alias>

    </application>



</manifest>

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * Copyright (c) 2015, The CyanogenMod Project

 * Copyright (c) 2017-2021 The LineageOS Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

-->

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

    <!-- Status bar - icons -->

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

</resources>