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

Merge "Change package name for merging to SettingsLibWidget" into tm-qpr-dev am: 1f2a3d9f37

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19448612

Change-Id: I4d0a6a1dd71b417a0b07d0884454a6ddab7d6f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
George Lin
2022-08-01 16:50:44 +00:00
committed by Automerger Merge Worker
parent 63bc27c924 1f2a3d9f37
commit c885ae3582
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" <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" /> <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" <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" /> <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 androidx.preference.PreferenceFragmentCompat;
import com.android.settingslib.utils.BuildCompatUtils; 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.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 androidx.fragment.app.FragmentActivity;
import com.android.settingslib.utils.BuildCompatUtils; 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.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; 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.annotation.Nullable;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import com.android.settingslib.widget.R;
import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; 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.appcompat.app.AppCompatActivity;
import androidx.coordinatorlayout.widget.CoordinatorLayout; 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.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; 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" <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" /> <uses-sdk android:minSdkVersion="29" />