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

Commit 629bff9e authored by Gabriele M's avatar Gabriele M
Browse files

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
parent 5a7a7e96

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

+7 −36
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.support.v14.preference.PreferenceFragment; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.util.Log;

import android.view.MenuItem;



import com.android.settingslib.drawer.SettingsDrawerActivity;

import com.android.systemui.R;
@@ -33,8 +32,6 @@ public class TunerActivity extends SettingsDrawerActivity implements 


    private static final String TAG_TUNER = "tuner";



    private String mInitialTitle;



    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -53,13 +50,6 @@ public class TunerActivity extends SettingsDrawerActivity implements 


            getFragmentManager().beginTransaction().replace(R.id.content_frame,

                    fragment, TAG_TUNER).commit();



            mInitialTitle = String.valueOf(getActionBar().getTitle());



            String extra = getIntent().getStringExtra(TAG_TUNER);

            if (extra != null) {

                startPreferenceScreen((PreferenceFragment)fragment, extra, false);

            }

        }

    }
@@ -67,18 +57,7 @@ public class TunerActivity extends SettingsDrawerActivity implements 
    public void onBackPressed() {

        if (!getFragmentManager().popBackStackImmediate()) {

            super.onBackPressed();

        } else {

            getActionBar().setTitle(mInitialTitle);

        }

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        }

        return false;

    }



    @Override
@@ -87,7 +66,7 @@ public class TunerActivity extends SettingsDrawerActivity implements 
            Class<?> cls = Class.forName(pref.getFragment());

            Fragment fragment = (Fragment) cls.newInstance();

            FragmentTransaction transaction = getFragmentManager().beginTransaction();

            getActionBar().setTitle(pref.getTitle());

            setTitle(pref.getTitle());

            transaction.replace(R.id.content_frame, fragment);

            transaction.addToBackStack("PreferenceFragment");

            transaction.commit();
@@ -98,34 +77,26 @@ public class TunerActivity extends SettingsDrawerActivity implements 
        }

    }



    private boolean startPreferenceScreen(PreferenceFragment caller, String key, boolean backStack) {

    @Override

    public boolean onPreferenceStartScreen(PreferenceFragment caller, PreferenceScreen pref) {

        FragmentTransaction transaction = getFragmentManager().beginTransaction();

        SubSettingsFragment fragment = new SubSettingsFragment();

        final Bundle b = new Bundle(1);

        b.putString(PreferenceFragment.ARG_PREFERENCE_ROOT, key);

        b.putString(PreferenceFragment.ARG_PREFERENCE_ROOT, pref.getKey());

        fragment.setArguments(b);

        fragment.setTargetFragment(caller, 0);

        transaction.replace(R.id.content_frame, fragment);

        if (backStack) {

        transaction.addToBackStack("PreferenceFragment");

        }

        transaction.commit();



        return true;

    }



    @Override

    public boolean onPreferenceStartScreen(PreferenceFragment caller, PreferenceScreen pref) {

        return startPreferenceScreen(caller, pref.getKey(), true);

    }



    public static class SubSettingsFragment extends PreferenceFragment {

        @Override

        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

            PreferenceScreen p = (PreferenceScreen) ((PreferenceFragment) getTargetFragment())

                    .getPreferenceScreen().findPreference(rootKey);

            setPreferenceScreen(p);

            getActivity().getActionBar().setTitle(p.getTitle());

            setPreferenceScreen((PreferenceScreen) ((PreferenceFragment) getTargetFragment())

                    .getPreferenceScreen().findPreference(rootKey));

        }

    }

}

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

+0 −9
Original line number Diff line number Diff line
@@ -40,11 +40,8 @@ import com.android.systemui.R; 
public class TunerFragment extends PreferenceFragment {



    private static final String TAG = "TunerFragment";

    private static final String TAG_TUNER = "tuner";



    private static final String KEY_BATTERY_PCT = "battery_pct";

    private static final String KEY_NAV_BAR = "nav_bar";

    private static final String KEY_STATUS_BAR = "status_bar";



    public static final String SETTING_SEEN_TUNER_WARNING = "seen_tuner_warning";
@@ -69,12 +66,6 @@ public class TunerFragment extends PreferenceFragment { 
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

        addPreferencesFromResource(R.xml.tuner_prefs);



        String extra = getActivity().getIntent().getStringExtra(TAG_TUNER);

        if (extra == null) {

            getPreferenceScreen().removePreference(findPreference(KEY_NAV_BAR));

            getPreferenceScreen().removePreference(findPreference(KEY_STATUS_BAR));

        }



        /**

         * OHAI

        if (Settings.Secure.getInt(getContext().getContentResolver(), SETTING_SEEN_TUNER_WARNING,