From 81fa5ace468ffb56d88a47586e49dc218dfdc3e2 Mon Sep 17 00:00:00 2001
From: Maggie <yiranwang@google.com>
Date: Fri, 2 Mar 2018 10:39:08 -0800
Subject: [PATCH] Fix non-unique keys for location settings

Bug: 74104689
Test: Robo
Change-Id: I54ead73b69a6c62897d6b99e14fa5b6627163052
---
 res/xml/location_settings.xml                                 | 2 +-
 .../location/RecentLocationRequestPreferenceController.java   | 4 ++--
 .../RecentLocationRequestPreferenceControllerTest.java        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 3f96c58d98d..d616bb69f6e 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -25,7 +25,7 @@
             android:title="@string/location_category_recent_location_requests"/>
 
         <Preference
-            android:key="recent_location_requests_see_all"
+            android:key="recent_location_requests_see_all_button"
             android:title="@string/location_recent_location_requests_see_all"
             android:icon="@drawable/ic_chevron_right_24dp"
             android:selectable="true"
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index b017ec1f3ce..b2a648fe6b0 100644
--- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -34,7 +34,7 @@ public class RecentLocationRequestPreferenceController extends LocationBasePrefe
     /** Key for preference category "Recent location requests" */
     private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
     @VisibleForTesting
-    static final String KEY_SEE_ALL = "recent_location_requests_see_all";
+    static final String KEY_SEE_ALL_BUTTON = "recent_location_requests_see_all_button";
     private final LocationSettings mFragment;
     private final RecentLocationApps mRecentLocationApps;
     private PreferenceCategory mCategoryRecentLocationRequests;
@@ -93,7 +93,7 @@ public class RecentLocationRequestPreferenceController extends LocationBasePrefe
         super.displayPreference(screen);
         mCategoryRecentLocationRequests =
                 (PreferenceCategory) screen.findPreference(KEY_RECENT_LOCATION_REQUESTS);
-        mSeeAllButton = screen.findPreference(KEY_SEE_ALL);
+        mSeeAllButton = screen.findPreference(KEY_SEE_ALL_BUTTON);
 
     }
 
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index 1bacd5b49d2..3c909893b5d 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -86,7 +86,7 @@ public class RecentLocationRequestPreferenceControllerTest {
         mController = spy(new RecentLocationRequestPreferenceController(
                 mContext, mFragment, mLifecycle, mRecentLocationApps));
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory);
-        when(mScreen.findPreference(mController.KEY_SEE_ALL)).thenReturn(mSeeAllButton);
+        when(mScreen.findPreference(mController.KEY_SEE_ALL_BUTTON)).thenReturn(mSeeAllButton);
         final String key = mController.getPreferenceKey();
         when(mCategory.getKey()).thenReturn(key);
         when(mCategory.getContext()).thenReturn(mContext);