commit 5a08eb07335110042f1dab2fee28f899acceeb2e
author Sanket Padawe <sanketpadawe@google.com> Wed Jan 07 22:48:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 07 22:48:49 2015 +0000
tree e939c1f414eb91b8cc984b564c25e4e4be864f63
parent 53d4a3dc29d1a0f2cf384cb0bfc982c1ce622e0a
parent a564e9bb5aad96dd4571deb78a81774043e5287e

Merge "Fixes Cell network setting items grayed out." into lmp-mr1-dev

res/xml/cdma_options.xml

diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
index d4eaeba..78e3630 100644
--- a/res/xml/cdma_options.xml
+++ b/res/xml/cdma_options.xml
@@ -34,7 +34,7 @@
         android:dialogTitle="@string/cdma_subscription_dialogtitle" />
 
     <PreferenceScreen
-        android:key="button_apn_key"
+        android:key="button_apn_key_cdma"
         android:title="@string/apn_settings"
         android:persistent="false">
 

src/com/android/phone/CdmaOptions.java

diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 897c797..a04427e 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -46,7 +46,7 @@
     private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";
     private static final String BUTTON_CDMA_ACTIVATE_DEVICE_KEY = "cdma_activate_device_key";
     private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
-    private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key";
+    private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key_cdma";
 
     private PreferenceActivity mPrefActivity;
     private PreferenceScreen mPrefScreen;