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

Commit 7d0d54e5 authored by Fan Zhang's avatar Fan Zhang
Browse files

Use standard Activity as TunerActivity's base. 

This is the last activity that depends on SettingsDrawerActivity. This
activity doesn't actually need any functionality from
SettingsDrawerActivity, so we can switch to a standard Activity to
reduce dependency and improve performance.

Bug: 77600770
Test: adb shell am start -a com.android.settings.action.DEMO_MODE
Change-Id: I78ff488be764ae996a96ad4eee05a8c1774a1835
parent c75174b3

packages/SystemUI/res/layout/tuner_activity.xml

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

<!--

  Copyright (C) 2018 The Android Open Source 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.

  -->



<!-- The tuner content view -->

<LinearLayout

    android:id="@+id/content_parent"

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

    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"

        android:layout_height="fill_parent"

        android:background="?android:attr/windowBackground" />

</LinearLayout>
 
 No newline at end of file

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

+18 −5
Original line number Diff line number Diff line
@@ -15,21 +15,25 @@ 
 */

package com.android.systemui.tuner;



import android.app.Activity;

import android.app.Fragment;

import android.app.FragmentTransaction;

import android.os.Bundle;

import androidx.preference.PreferenceFragment;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import android.util.Log;

import android.view.MenuItem;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Toolbar;



import androidx.preference.Preference;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceScreen;



import com.android.settingslib.drawer.SettingsDrawerActivity;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.fragments.FragmentService;



public class TunerActivity extends SettingsDrawerActivity implements

public class TunerActivity extends Activity implements

        PreferenceFragment.OnPreferenceStartFragmentCallback,

        PreferenceFragment.OnPreferenceStartScreenCallback {
@@ -37,6 +41,15 @@ public class TunerActivity extends SettingsDrawerActivity implements 


    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

        requestWindowFeature(Window.FEATURE_NO_TITLE);

        setContentView(R.layout.tuner_activity);

        Toolbar toolbar = findViewById(R.id.action_bar);

        if (toolbar != null) {

            setActionBar(toolbar);

        }



        Dependency.initDependencies(this);



        if (getFragmentManager().findFragmentByTag(TAG_TUNER) == null) {