Merge "Update to show new location monitoring op."

res/values/arrays.xml

@@ -638,6 +638,7 @@
         <item>notification volume</item>
         <item>bluetooth volume</item>
         <item>keep awake</item>
+        <item>monitor location</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -683,6 +684,7 @@
         <item>Notification volume</item>
         <item>Bluetooth volume</item>
         <item>Keep awake</item>
+        <item>Location</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->

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

@@ -101,11 +101,13 @@ public class AppOpsState {
                     AppOpsManager.OP_FINE_LOCATION,
                     AppOpsManager.OP_GPS,
                     AppOpsManager.OP_WIFI_SCAN,
-                    AppOpsManager.OP_NEIGHBORING_CELLS },
+                    AppOpsManager.OP_NEIGHBORING_CELLS,
+                    AppOpsManager.OP_MONITOR_LOCATION },
             new boolean[] { true,
                     true,
                     false,
                     false,
+                    false,
                     false }
             );
 

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

@@ -909,6 +909,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
             BatterySipper bs;
             synchronized (mRequestQueue) {
                 if (mRequestQueue.isEmpty() || mAbort) {
+                    mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
                     mRequestThread = null;
                     return;
                 }
@@ -919,6 +920,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
     }
 
     static final int MSG_UPDATE_NAME_ICON = 1;
+    static final int MSG_REPORT_FULLY_DRAWN = 2;
 
     Handler mHandler = new Handler() {
 
@@ -935,6 +937,9 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                         pgp.setTitle(bs.name);
                     }
                     break;
+                case MSG_REPORT_FULLY_DRAWN:
+                    getActivity().reportFullyDrawn();
+                    break;
             }
             super.handleMessage(msg);
         }