From 7aeb3f54408a7bd0c1ca3020bca32900b2091b1d Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Wed, 19 Apr 2017 20:03:42 -0700 Subject: [PATCH] Move settingslib overlays to framework-res. AAPT2 no longer supports overlays of static libraries. As a result, these overlays don't work correctly any more. To fix, move the overlay config resources into framework-res. They can still be read by any of the apps using settingslib, but now actually work without having to override for each app. Bug: 33694217 Test: robotests Change-Id: I58df748d7646e8caee18614d87af1333fc84985c --- core/res/res/values/config.xml | 30 ++++++++++++ core/res/res/values/symbols.xml | 14 ++++++ packages/SettingsLib/res/values/config.xml | 49 ------------------- .../com/android/settingslib/HelpUtils.java | 17 ++++--- .../applications/ApplicationsState.java | 5 +- .../LocalBluetoothProfileManager.java | 2 +- .../settingslib/net/DataUsageController.java | 2 +- .../android/settingslib/HelpUtilsTest.java | 1 + 8 files changed, 59 insertions(+), 61 deletions(-) delete mode 100755 packages/SettingsLib/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 27a4d5c2f5afa..0fa1fdb3e844c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2833,4 +2833,34 @@ true + + + false + + + 2048 + + + false + + + + + + + + + + + + + + + + + + + + + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1dd8227edafda..2ac2615d60dae 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2976,4 +2976,18 @@ + + + + + + + + + + + + + + diff --git a/packages/SettingsLib/res/values/config.xml b/packages/SettingsLib/res/values/config.xml deleted file mode 100755 index 64f21b50c0bc6..0000000000000 --- a/packages/SettingsLib/res/values/config.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - false - - - 2048 - - - false - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java index 58047bb8e3f3f..2c26410799539 100644 --- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java @@ -180,21 +180,24 @@ public class HelpUtils { } Resources resources = context.getResources(); - boolean includePackageName = resources.getBoolean(R.bool.config_sendPackageName); + boolean includePackageName = + resources.getBoolean(com.android.internal.R.bool.config_sendPackageName); if (sendPackageName && includePackageName) { String[] packageNameKey = - {resources.getString(R.string.config_helpPackageNameKey)}; + {resources.getString(com.android.internal.R.string.config_helpPackageNameKey)}; String[] packageNameValue = - {resources.getString(R.string.config_helpPackageNameValue)}; + {resources.getString( + com.android.internal.R.string.config_helpPackageNameValue)}; String helpIntentExtraKey = - resources.getString(R.string.config_helpIntentExtraKey); + resources.getString(com.android.internal.R.string.config_helpIntentExtraKey); String helpIntentNameKey = - resources.getString(R.string.config_helpIntentNameKey); + resources.getString(com.android.internal.R.string.config_helpIntentNameKey); String feedbackIntentExtraKey = - resources.getString(R.string.config_feedbackIntentExtraKey); + resources.getString( + com.android.internal.R.string.config_feedbackIntentExtraKey); String feedbackIntentNameKey = - resources.getString(R.string.config_feedbackIntentNameKey); + resources.getString(com.android.internal.R.string.config_feedbackIntentNameKey); intent.putExtra(helpIntentExtraKey, packageNameKey); intent.putExtra(helpIntentNameKey, packageNameValue); intent.putExtra(feedbackIntentExtraKey, packageNameKey); diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index c109704673830..66dfecd2505f3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -50,8 +50,8 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.util.SparseArray; +import com.android.internal.R; import com.android.internal.util.ArrayUtils; -import com.android.settingslib.R; import java.io.File; import java.io.IOException; @@ -1276,8 +1276,7 @@ public class ApplicationsState { return true; } else { this.mounted = false; - this.icon = context.getDrawable( - com.android.internal.R.drawable.sym_app_on_sd_unavailable_icon); + this.icon = context.getDrawable(R.drawable.sym_app_on_sd_unavailable_icon); } } else if (!this.mounted) { // If the app wasn't mounted but is now mounted, reload diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java index 1ea592d7785d5..5a9a7496fa4f1 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java @@ -32,7 +32,7 @@ import android.content.Context; import android.content.Intent; import android.os.ParcelUuid; import android.util.Log; -import com.android.settingslib.R; +import com.android.internal.R; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java index 994ea88a80dda..b69232c80f691 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java @@ -32,7 +32,7 @@ import android.text.format.DateUtils; import android.text.format.Time; import android.util.Log; -import com.android.settingslib.R; +import com.android.internal.R; import java.util.Date; import java.util.Locale; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java index 56891f66b03c4..fdc42bf6724ad 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java @@ -27,6 +27,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.provider.Settings; import android.view.MenuItem; +import com.android.internal.R; import org.junit.Before; import org.junit.Test;