Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change package name for merging to SettingsLibWidget

Browse Source 
To have the modules merged to SettingsLibWidget, we changed the package
name in the Manifest to com.android.settingslib.widget

Test: WallpapaerPickerGoogle can successfully built after the merge of
modules
Bug: 240421545

Change-Id: If9eb4cefaa22c71eb8dad32618e84e1102c599df
This commit is contained in:
George Lin
2022-07-27 14:52:33 +00:00
parent 5837f00409
commit 771b0061b7
7 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.activityembedding">
package="com.android.settingslib.widget">
<uses-sdk android:minSdkVersion="21" />

2
packages/SettingsLib/CollapsingToolbarBaseActivity/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.collapsingtoolbar">
package="com.android.settingslib.widget">
<uses-sdk android:minSdkVersion="29" />

1
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/BasePreferencesFragment.java
View File

@@ -20,6 +20,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceFragmentCompat;
import com.android.settingslib.utils.BuildCompatUtils;
import com.android.settingslib.widget.R;
import com.google.android.material.appbar.AppBarLayout;

1
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
View File

@@ -27,6 +27,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import com.android.settingslib.utils.BuildCompatUtils;
import com.android.settingslib.widget.R;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;

2
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java
View File

@@ -30,6 +30,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import com.android.settingslib.widget.R;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;

2
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java
View File

@@ -36,7 +36,7 @@ import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import com.android.settingslib.collapsingtoolbar.R;
import com.android.settingslib.widget.R;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;

2
packages/SettingsLib/SettingsTransition/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.transition">
package="com.android.settingslib.widget">
<uses-sdk android:minSdkVersion="29" />