diff options
| -rw-r--r-- | packages/SettingsLib/ActionButtonsPreference/Android.bp | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Android.bp | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/Android.bp (renamed from packages/SettingsLib/SettingsLayoutPreference/Android.bp) | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/AndroidManifest.xml (renamed from packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/res/layout/layout_preference_frame.xml (renamed from packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml (renamed from packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/res/values/styles.xml (renamed from packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java (renamed from packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java) | 0 |
8 files changed, 4 insertions, 4 deletions
diff --git a/packages/SettingsLib/ActionButtonsPreference/Android.bp b/packages/SettingsLib/ActionButtonsPreference/Android.bp index e518e0b97c4b..cd3fb0cc2143 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 cc17b25d9a40..e588e9211a84 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 index 489d3606ae15..a1f9a768c76c 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 index 4b9f1ab8d6cc..4b9f1ab8d6cc 100644 --- a/packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml +++ b/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 index ee4ce499396f..ee4ce499396f 100644 --- a/packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml +++ b/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 index 01d9c00d94dd..01d9c00d94dd 100644 --- a/packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml +++ b/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 index 805744baef10..805744baef10 100644 --- a/packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml +++ b/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 index 2a635b0996e6..2a635b0996e6 100644 --- a/packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java +++ b/packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java |