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

Commit 0f0ee577 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 289d797a: QS: 7 day timeout for color-inversion tile. 

* commit '289d797a':
  QS: 7 day timeout for color-inversion tile.
parents 28bfe49e 289d797a

packages/SystemUI/res/values/config.xml

+5 −2
Original line number Diff line number Diff line
@@ -238,8 +238,11 @@ 
    <!-- Volume: time to delay dismissing the volume panel after a click is performed -->

    <integer name="volume_panel_dismiss_delay">200</integer>



    <!-- Tiles with feature timeouts: number of days to show after feature is used. -->

    <integer name="days_to_show_timeout_tiles">30</integer>

    <!-- Hotspot tile: number of days to show after feature is used. -->

    <integer name="days_to_show_hotspot_tile">30</integer>



    <!-- Color inversion tile: number of days to show after feature is used. -->

    <integer name="days_to_show_color_inversion_tile">7</integer>



    <!-- Number of times to show the strong alarm warning text in the volume dialog -->

    <integer name="zen_mode_alarm_warning_threshold">5</integer>

packages/SystemUI/src/com/android/systemui/qs/UsageTracker.java

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.SharedPreferences;



import com.android.systemui.R;

import com.android.systemui.statusbar.policy.Listenable;



public class UsageTracker implements Listenable {
@@ -35,11 +34,10 @@ public class UsageTracker implements Listenable { 


    private boolean mRegistered;



    public UsageTracker(Context context, Class<?> tile) {

    public UsageTracker(Context context, Class<?> tile, int timeoutResource) {

        mContext = context;

        mPrefKey = tile.getSimpleName() + "LastUsed";

        mTimeToShowTile = MILLIS_PER_DAY * mContext.getResources()

                .getInteger(R.integer.days_to_show_timeout_tiles);

        mTimeToShowTile = MILLIS_PER_DAY * mContext.getResources().getInteger(timeoutResource);

        mResetAction = "com.android.systemui.qs." + tile.getSimpleName() + ".usage_reset";

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> { 
                }

            }

        };

        mUsageTracker = new UsageTracker(host.getContext(), ColorInversionTile.class);

        mUsageTracker = new UsageTracker(host.getContext(), ColorInversionTile.class,

                R.integer.days_to_show_color_inversion_tile);

        if (mSetting.getValue() != 0 && !mUsageTracker.isRecentlyUsed()) {

            mUsageTracker.trackUsage();

        }

packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java

+6 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { 
    public HotspotTile(Host host) {

        super(host);

        mController = host.getHotspotController();

        mUsageTracker = new UsageTracker(host.getContext(), HotspotTile.class);

        mUsageTracker = newUsageTracker(host.getContext());

        mUsageTracker.setListening(true);

    }
@@ -84,6 +84,10 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { 
        }

    }



    private static UsageTracker newUsageTracker(Context context) {

        return new UsageTracker(context, HotspotTile.class, R.integer.days_to_show_hotspot_tile);

    }



    private final class Callback implements HotspotController.Callback {

        @Override

        public void onHotspotChanged(boolean enabled) {
@@ -101,7 +105,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { 
        @Override

        public void onReceive(Context context, Intent intent) {

            if (mUsageTracker == null) {

                mUsageTracker = new UsageTracker(context, HotspotTile.class);

                mUsageTracker = newUsageTracker(context);

            }

            mUsageTracker.trackUsage();

        }