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

Commit 15ab7758 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Update to show new location monitoring op. 

Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
parent 9333cc7d

res/values/arrays.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -638,6 +638,7 @@ 
        <item>notification volume</item>

        <item>notification volume</item>

        <item>bluetooth volume</item>

        <item>bluetooth volume</item>

        <item>keep awake</item>

        <item>keep awake</item>

        <item>monitor location</item>

    </string-array>

    </string-array>





    <!-- User display names for app ops codes -->

    <!-- User display names for app ops codes -->
@@ -683,6 +684,7 @@ 
        <item>Notification volume</item>

        <item>Notification volume</item>

        <item>Bluetooth volume</item>

        <item>Bluetooth volume</item>

        <item>Keep awake</item>

        <item>Keep awake</item>

        <item>Location</item>

    </string-array>

    </string-array>





    <!-- Titles for the list of long press timeout options. -->

    <!-- Titles for the list of long press timeout options. -->

src/com/android/settings/applications/AppOpsState.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -101,11 +101,13 @@ public class AppOpsState { 
                    AppOpsManager.OP_FINE_LOCATION,

                    AppOpsManager.OP_FINE_LOCATION,

                    AppOpsManager.OP_GPS,

                    AppOpsManager.OP_GPS,

                    AppOpsManager.OP_WIFI_SCAN,

                    AppOpsManager.OP_WIFI_SCAN,

                    AppOpsManager.OP_NEIGHBORING_CELLS },

                    AppOpsManager.OP_NEIGHBORING_CELLS,

                    AppOpsManager.OP_MONITOR_LOCATION },

            new boolean[] { true,

            new boolean[] { true,

                    true,

                    true,

                    false,

                    false,

                    false,

                    false,

                    false,

                    false }

                    false }

            );

            );

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -909,6 +909,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 
            BatterySipper bs;

            BatterySipper bs;

            synchronized (mRequestQueue) {

            synchronized (mRequestQueue) {

                if (mRequestQueue.isEmpty() || mAbort) {

                if (mRequestQueue.isEmpty() || mAbort) {

                    mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);

                    mRequestThread = null;

                    mRequestThread = null;

                    return;

                    return;

                }

                }
@@ -919,6 +920,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 
    }

    }





    static final int MSG_UPDATE_NAME_ICON = 1;

    static final int MSG_UPDATE_NAME_ICON = 1;

    static final int MSG_REPORT_FULLY_DRAWN = 2;





    Handler mHandler = new Handler() {

    Handler mHandler = new Handler() {
@@ -935,6 +937,9 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 
                        pgp.setTitle(bs.name);

                        pgp.setTitle(bs.name);

                    }

                    }

                    break;

                    break;

                case MSG_REPORT_FULLY_DRAWN:

                    getActivity().reportFullyDrawn();

                    break;

            }

            }

            super.handleMessage(msg);

            super.handleMessage(msg);

        }

        }