From 20fb65fb84caa08586f481695cc103e311597118 Mon Sep 17 00:00:00 2001 From: Yuchen Dong Date: Thu, 23 Aug 2018 17:32:40 +0900 Subject: [PATCH 1/8] Wrong Carrier Config values are used in ApnSettings for Multi SIM device In ApnSettings, it always uses Carrier Config values of default subId. So, wrong carrier config values are used for non-default subId. To resolve this issue, read Carrier Config values based on subId. Test: manual - Check Carrier Config values are read based on subId. Bug: 111172301 Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341 --- src/com/android/settings/network/ApnSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index 288cccbe2b0..e9d496a515a 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -185,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements CarrierConfigManager configManager = (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE); - PersistableBundle b = configManager.getConfig(); + PersistableBundle b = configManager.getConfigForSubId(mSubId); mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL); mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL); if (mAllowAddingApns) { From 2f4f269264b36e70cf679eaeda0bebd254433388 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Thu, 20 Sep 2018 17:03:23 -0700 Subject: [PATCH 2/8] Redo the empty states in print settings In the end the UI does not change but the new states: - Are similar to the "empty" states we use in the print spooler - Use the system print icon - Use a translucent background icon which works correctly with dark mode Test: Looked at all changed Settings pages Fixes: 115830412 Change-Id: I1f5b005674e7072e989355f01ebd3fdaf56c9355 --- res/drawable-hdpi/ic_grayedout_printer.png | Bin 3418 -> 0 bytes res/drawable-mdpi/ic_grayedout_printer.png | Bin 3418 -> 0 bytes res/drawable-xhdpi/ic_grayedout_printer.png | Bin 3418 -> 0 bytes res/layout/empty_print_state.xml | 70 ++++++++---------- .../empty_printers_list_service_enabled.xml | 65 ++++++++-------- .../print/PrintServiceSettingsFragment.java | 4 - 6 files changed, 60 insertions(+), 79 deletions(-) delete mode 100644 res/drawable-hdpi/ic_grayedout_printer.png delete mode 100644 res/drawable-mdpi/ic_grayedout_printer.png delete mode 100644 res/drawable-xhdpi/ic_grayedout_printer.png diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png deleted file mode 100644 index 5e54970d6b3f5d578eae30a282f2bcd391aef518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 E0#XJSga7~l diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png deleted file mode 100644 index 5e54970d6b3f5d578eae30a282f2bcd391aef518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 E0#XJSga7~l diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png deleted file mode 100644 index 5e54970d6b3f5d578eae30a282f2bcd391aef518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 E0#XJSga7~l diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml index 361bf3c1f52..43312c8c267 100644 --- a/res/layout/empty_print_state.xml +++ b/res/layout/empty_print_state.xml @@ -14,48 +14,40 @@ limitations under the License. --> - + - + + + android:textAppearance="?android:attr/textAppearanceLarge" + android:textColor="?android:attr/textColorSecondary" /> - - +