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

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

SystemUI: Bringup tuner statusbar changes 



Based on the following changes:

Author: Steve Kondik <steve@cyngn.com>
Date:   Wed Sep 14 05:08:02 2016 -0700
    systemui: Fix a few issues with Tuner
     * Allow launching PreferenceScreens directly by setting the
       "tuner" extra to a valid key.
     * Remove the silly warning. There are no dragons here.
     * Move CM stuff to CM manifest.
     * Fix the ActionBar title when navigating.
    Change-Id: Ideac31dbfd71d7c0aa7fc3c20395c24128c598fc

Author: Gabriele M <moto.falcon.git@gmail.com>
Date:   Sat Sep 16 19:35:28 2017 +0200
    SystemUI: Revert some Tuner changes
    These changes were done to start the status bar tuner directly without
    showing the main Tuner screen. However, they negatively affect the
    management of the fragments. Revert them so that a different solution
    can be implemented in a follow-up change.
    This reverts the following commits:
     - 338de672
       "Handle onOptionsItemSelected for TunerActivity"
     - b3eba6af
       "SystemUI: Remove nav bar and status bar options from SystemUI Tuner"
     - 82b9f95f (partially)
       "systemui: Fix a few issues with Tuner"
    BUGBASH-661
    Change-Id: I35182248566ff31ed08d2836d66d5bd3f947ee9a

Author: Gabriele M <moto.falcon.git@gmail.com>
Date:   Sat Sep 16 19:35:38 2017 +0200
    SystemUI: Add separate pref screen for the status bar tuner
    Keep the status bar preferences separate and allow to start them
    directly without loading the main tuner fragment.
    Change-Id: Ie1a0d9395b7bc01d585616a1976adeda3c457a0d

Author: SagarMakhar <sagarmakhar@gmail.com>
Date:   Thu Oct 21 10:31:56 2021 +0000

    Adapt tuner prefs to S settings style & cleanup

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

Change-Id: Icc84575db18931d3a43bd9e640f2a55a51b460c1
parent 3dec89bb

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ android_library { 
        "motion_tool_lib",

    ],

    manifest: "AndroidManifest.xml",

    additional_manifests: ["LineageManifest.xml"],



    javacflags: ["-Adagger.fastInit=enabled"],

    kotlincflags: ["-Xjvm-default=enable"],

packages/SystemUI/AndroidManifest.xml

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