Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 771b0061 authored by George Lin's avatar George Lin
Browse files

Change package name for merging to SettingsLibWidget 

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
parent 5837f004

packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

packages/SettingsLib/CollapsingToolbarBaseActivity/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+2 −0
Original line number Diff line number Diff line
@@ -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;