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

Commit b7d36134 authored by Xuefer's avatar Xuefer Committed by Gerrit Code Review
Browse files

qs: support for all timeout value in case set by user apps 

fix bug: after timeout is set by apps like Tasker to values not in the
 known options list (e.g. 23 Hours), changing the value no longer 
update tile title, it stay as "23 Hours"

Change-Id: Ica11d473de6935bac02ba30557ac1b1e30d3211b
parent 6d63ba2e

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

+27 −36
Original line number Diff line number Diff line
@@ -184,10 +184,7 @@ public class ScreenTimeoutTile extends QSTile<ScreenTimeoutTile.TimeoutState> { 
        Bucket nextBucket = Bucket.getBucket(newTimeout);

        Bucket previousBucket = Bucket.getBucket(state.previousTimeout);



        switch (state.previousTimeout) {

            case 0:

            case 15000:

            case 30000:

        if (state.previousTimeout < 60000) {

            // Default

            drawableId = R.drawable.ic_qs_screen_timeout_med_reverse_avd;

            if (nextBucket == Bucket.MEDIUM) {
@@ -197,10 +194,7 @@ public class ScreenTimeoutTile extends QSTile<ScreenTimeoutTile.TimeoutState> { 
                // Large

                drawableId = R.drawable.ic_qs_screen_timeout_short_reverse_avd;

            }

                break;

            case 60000:

            case 120000:

            case 300000:

        } else if (state.previousTimeout < 600000) {

            // Default

            drawableId = R.drawable.ic_qs_screen_timeout_short_avd;

            if (nextBucket == Bucket.SMALL) {
@@ -210,9 +204,7 @@ public class ScreenTimeoutTile extends QSTile<ScreenTimeoutTile.TimeoutState> { 
                // Large

                drawableId = R.drawable.ic_qs_screen_timeout_med_avd;

            }

                break;

            case 600000:

            case 1800000:

        } else {

            drawableId = R.drawable.ic_qs_screen_timeout_med_avd;

            if (nextBucket == Bucket.MEDIUM) {

                // Small
@@ -221,7 +213,6 @@ public class ScreenTimeoutTile extends QSTile<ScreenTimeoutTile.TimeoutState> { 
                // Large

                drawableId = R.drawable.ic_qs_screen_timeout_long_avd;

            }

                break;

        }



        if (state.icon == null || previousBucket != nextBucket) {