Merge "Rename two targets to have SettingsLib prefix"

2018-12-10 19:36:12 +00:00
parent f8b6203284 2f7fd418f6
commit 7597ca884d
8 changed files with 4 additions and 4 deletions
--- a/packages/SettingsLib/ActionButtonsPreference/Android.bp
+++ b/packages/SettingsLib/ActionButtonsPreference/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "ActionButtonsPreference",
+    name: "SettingsLibActionButtonsPreference",

    srcs: ["src/**/*.java"],
    resource_dirs: ["res"],
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -16,8 +16,8 @@ android_library {
        "SettingsLibAppPreference",
        "SettingsLibSearchWidget",
        "SettingsLibSettingsSpinner",
-        "SettingsLayoutPreference",
-        "ActionButtonsPreference",
+        "SettingsLibLayoutPreference",
+        "SettingsLibActionButtonsPreference",
    ],

    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
--- a/packages/SettingsLib/SettingsLayoutPreference/Android.bp
+++ b/packages/SettingsLib/SettingsLayoutPreference/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "SettingsLayoutPreference",
+    name: "SettingsLibLayoutPreference",

    srcs: ["src/**/*.java"],
    resource_dirs: ["res"],
--- a/packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml
+++ b/packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml
--- a/packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml
+++ b/packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml
--- a/packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml
+++ b/packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml
--- a/packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml
+++ b/packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml
--- a/packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java
+++ b/packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java