From 2f7fd418f61560eb182fa679d570cdc78a871c5d Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Sat, 8 Dec 2018 23:45:24 +0800
Subject: [PATCH] Rename two targets to have SettingsLib prefix

- Rename lib name of ActionButtonsPreference and LayoutPreference.
- Remove Settings* prefix for directory name of LayoutPreference.
The LayoutPreference is in settingslib so it's pretty clear
it's a settings widget.

Test: Rebuild
Change-Id: I8f4b8643ee4b2cb3756d1c3e82d91021916e08c2
Fixes: 120706174
---
 packages/SettingsLib/ActionButtonsPreference/Android.bp       | 2 +-
 packages/SettingsLib/Android.bp                               | 4 ++--
 .../{SettingsLayoutPreference => LayoutPreference}/Android.bp | 2 +-
 .../AndroidManifest.xml                                       | 0
 .../res/layout/layout_preference_frame.xml                    | 0
 .../res/layout/settings_entity_header.xml                     | 0
 .../res/values/styles.xml                                     | 0
 .../src/com/android/settingslib/widget/LayoutPreference.java  | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/Android.bp (83%)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/AndroidManifest.xml (100%)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/res/layout/layout_preference_frame.xml (100%)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/res/layout/settings_entity_header.xml (100%)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/res/values/styles.xml (100%)
 rename packages/SettingsLib/{SettingsLayoutPreference => LayoutPreference}/src/com/android/settingslib/widget/LayoutPreference.java (100%)

diff --git a/packages/SettingsLib/ActionButtonsPreference/Android.bp b/packages/SettingsLib/ActionButtonsPreference/Android.bp
index e518e0b97c4b2..cd3fb0cc2143b 100644
--- 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"],
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index cc17b25d9a406..e588e9211a841 100644
--- 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
diff --git a/packages/SettingsLib/SettingsLayoutPreference/Android.bp b/packages/SettingsLib/LayoutPreference/Android.bp
similarity index 83%
rename from packages/SettingsLib/SettingsLayoutPreference/Android.bp
rename to packages/SettingsLib/LayoutPreference/Android.bp
index 489d3606ae150..a1f9a768c76c9 100644
--- a/packages/SettingsLib/SettingsLayoutPreference/Android.bp
+++ b/packages/SettingsLib/LayoutPreference/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "SettingsLayoutPreference",
+    name: "SettingsLibLayoutPreference",
 
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
diff --git a/packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml b/packages/SettingsLib/LayoutPreference/AndroidManifest.xml
similarity index 100%
rename from packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml
rename to packages/SettingsLib/LayoutPreference/AndroidManifest.xml
diff --git a/packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml b/packages/SettingsLib/LayoutPreference/res/layout/layout_preference_frame.xml
similarity index 100%
rename from packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml
rename to packages/SettingsLib/LayoutPreference/res/layout/layout_preference_frame.xml
diff --git a/packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml b/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
similarity index 100%
rename from packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml
rename to packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
diff --git a/packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml b/packages/SettingsLib/LayoutPreference/res/values/styles.xml
similarity index 100%
rename from packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml
rename to packages/SettingsLib/LayoutPreference/res/values/styles.xml
diff --git a/packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java b/packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java
similarity index 100%
rename from packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java
rename to packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java