summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/location
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-03-15 21:36:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-15 21:36:41 +0000
commit20886072af0203272f93b748a2416c07afed6814 (patch)
treecd2fced1cc7ae5ce585acad9d6314d0097f58dbc /src/com/android/settings/location
parent8bdef807ac9d668754a21cdaf8a49956e2d6ef6b (diff)
parent754ce92037fad14a046fd443b5b6b8c31a301c73 (diff)
downloadpackages_apps_Settings-20886072af0203272f93b748a2416c07afed6814.tar.gz
packages_apps_Settings-20886072af0203272f93b748a2416c07afed6814.tar.bz2
packages_apps_Settings-20886072af0203272f93b748a2416c07afed6814.zip
Merge changes I85ca2b69,Ibd7a47cb,I79522aab
* changes: Update strings for scanning settings Display empty message if no recent location access Add comment to help translator with plural forms
Diffstat (limited to 'src/com/android/settings/location')
-rw-r--r--src/com/android/settings/location/RecentLocationAccessPreferenceController.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 8a439b7a9c..a76d381418 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -74,6 +74,7 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
mController = AppEntitiesHeaderController.newInstance(mContext, view)
.setHeaderTitleRes(R.string.location_category_recent_location_access)
.setHeaderDetailsRes(R.string.location_recent_location_access_view_details)
+ .setHeaderEmptyRes(R.string.location_no_recent_accesses)
.setHeaderDetailsClickListener((View v) -> {
final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
@@ -114,8 +115,6 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
for (; i < MAXIMUM_APP_COUNT; i++) {
mController.removeAppEntity(i);
}
- } else {
- // If there's no item to display, add a "No recent apps" item.
}
mController.apply();
}