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

Commit 9e558b86 authored by Danny Baumann's avatar Danny Baumann Committed by jackmu95
Browse files

Reflect current state of torch in navigation ring button. 

JIRA: CYAN-574

Patch Set 1  -  Initial release
Patch Set 2  -  Show the current state

Change-Id: I82594726df1c0b4b34efdb6e58a0300f99cb1cde
parent 23fb4d3e

core/java/com/android/internal/util/cm/NavigationRingHelpers.java

+14 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class NavigationRingHelpers { 
        } else if (action.equals(ACTION_POWER)) {

            resourceId = com.android.internal.R.drawable.ic_navigation_ring_power;

        } else if (action.equals(ACTION_TORCH)) {

            resourceId = com.android.internal.R.drawable.ic_navigation_ring_torch;

            resourceId = getTorchDrawableResId(context);

        } else if (action.equals(ACTION_ASSIST)) {

            resourceId = com.android.internal.R.drawable.ic_action_assist_generic;

        }
@@ -195,7 +195,17 @@ public class NavigationRingHelpers { 
        }

    }



    public static void updateRingerIconIfNeeded(Context context,

    private static int getTorchDrawableResId(Context context) {

        boolean active = Settings.System.getInt(context.getContentResolver(),

                Settings.System.TORCH_STATE, 0) != 0;



        if (active) {

            return com.android.internal.R.drawable.ic_navigation_ring_torch_on;

        }

        return com.android.internal.R.drawable.ic_navigation_ring_torch_off;

    }



    public static void updateDynamicIconIfNeeded(Context context,

            GlowPadView view, String action, int position) {

        int resourceId = -1;
@@ -205,6 +215,8 @@ public class NavigationRingHelpers { 
            resourceId = getSilentDrawableResId(context);

        } else if (TextUtils.equals(action, ACTION_RING_SILENT_VIBRATE)) {

            resourceId = getRingerDrawableResId(context);

        } else if (TextUtils.equals(action, ACTION_TORCH)) {

            resourceId = getTorchDrawableResId(context);

        }



        if (resourceId > 0) {

core/res/res/drawable-hdpi/ic_navigation_ring_torch_activated.png

deleted100644 → 0
−9.77 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_navigation_ring_torch_normal.png

deleted100644 → 0
−6.06 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_navigation_ring_torch_off_activated.png

0 → 100644
+7.1 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_navigation_ring_torch_off_normal.png

0 → 100644
+6.22 KiB
Loading image diff...