From 9b625f0baa712aa75daba06adb400774239922bd Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 11 Sep 2013 13:03:14 -0700 Subject: [PATCH 1/2] Fix manifest entry for CAPTIONING_SETTINGS action BUG: 10708261 Change-Id: I54cfd8eaae97ed3da165521b9b4e73924bd3f0e1 --- src/com/android/settings/Settings.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 62d4aa899c6..e754f986d39 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -54,6 +54,7 @@ import android.widget.TextView; import com.android.internal.util.ArrayUtils; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment; +import com.android.settings.accessibility.ToggleCaptioningPreferenceFragment; import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.AuthenticatorHelper; import com.android.settings.accounts.ManageAccountsSettings; @@ -317,6 +318,7 @@ public class Settings extends PreferenceActivity PrivacySettings.class.getName(), DeviceAdminSettings.class.getName(), AccessibilitySettings.class.getName(), + ToggleCaptioningPreferenceFragment.class.getName(), TextToSpeechSettings.class.getName(), Memory.class.getName(), DevelopmentSettings.class.getName(), @@ -940,6 +942,7 @@ public class Settings extends PreferenceActivity public static class StorageUseActivity extends Settings { /* empty */ } public static class DevelopmentSettingsActivity extends Settings { /* empty */ } public static class AccessibilitySettingsActivity extends Settings { /* empty */ } + public static class CaptioningSettingsActivity extends Settings { /* empty */ } public static class SecuritySettingsActivity extends Settings { /* empty */ } public static class LocationSettingsActivity extends Settings { /* empty */ } public static class PrivacySettingsActivity extends Settings { /* empty */ } From 8b4cdbebcfb53b57ac2afec1b1e3377d6a02bb21 Mon Sep 17 00:00:00 2001 From: David Christie Date: Thu, 12 Sep 2013 17:40:11 -0700 Subject: [PATCH 2/2] Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS. Change-Id: I7d4db25c615df2ec41e93b1b3191ba606d26719d --- src/com/android/settings/location/RecentLocationApps.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java index 1fa8aac7e36..65fef80c547 100644 --- a/src/com/android/settings/location/RecentLocationApps.java +++ b/src/com/android/settings/location/RecentLocationApps.java @@ -194,9 +194,10 @@ public class RecentLocationApps { List entries = ops.getOps(); boolean highBattery = false; boolean normalBattery = false; + // Earliest time for a location request to end and still be shown in list. + long recentLocationCutoffTime = now - RECENT_TIME_INTERVAL_MILLIS; for (AppOpsManager.OpEntry entry : entries) { - // If previous location activity is older than designated interval, ignore this app. - if (now - entry.getTime() <= RECENT_TIME_INTERVAL_MILLIS) { + if (entry.isRunning() || entry.getTime() >= recentLocationCutoffTime) { switch (entry.getOp()) { case AppOpsManager.OP_MONITOR_LOCATION: normalBattery = true;