From 507e5f8c90cbf697bfbd9e29c6a72b8ef8acbb18 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sun, 16 Oct 2022 14:14:02 +0800 Subject: [PATCH] Fix some errors for Settings project Attrs could not have same name, so create a common parent for the messageText. And BiometricEnrollCheckbox is not in use. Replace some com.android.settingslib.R with com.android.settings.R, because these are files in settings instead of settingslib. Bug: 253772249 Test: TAP Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b --- res/values/attrs.xml | 21 ++++++++----------- .../AppOpenByDefaultPreferenceController.java | 2 +- .../bluetooth/QrCodeScanModeActivity.java | 2 +- .../bluetooth/QrCodeScanModeBaseActivity.java | 2 +- .../bluetooth/QrCodeScanModeFragment.java | 2 +- .../profileselector/UserAdapter.java | 2 +- .../homepage/TopLevelHighlightMixin.java | 21 ++++++++++--------- .../notification/NotificationBackend.java | 11 +--------- .../notification/app/BubblePreference.java | 3 +-- .../app/ConversationPriorityPreference.java | 3 +-- .../app/ImportancePreference.java | 8 +++---- .../android/settings/widget/UsageGraph.java | 2 +- .../android/settings/widget/UsageView.java | 2 +- .../wifi/ConnectedWifiEntryPreference.java | 2 +- .../settings/wifi/LinkablePreference.java | 2 +- 15 files changed, 35 insertions(+), 50 deletions(-) diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 307871716aa..599a145bd1d 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -93,10 +93,14 @@ - - - + + + + + + + @@ -146,16 +150,9 @@ - - - - - - - - - + + diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 2c76f056a7c..cbaf75f5474 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -27,10 +27,10 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.intentpicker.AppLaunchSettings; import com.android.settings.applications.intentpicker.IntentPickerUtils; -import com.android.settingslib.R; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java index 690c07ec560..92786c9b813 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java @@ -26,7 +26,7 @@ import android.util.Log; import androidx.fragment.app.FragmentTransaction; -import com.android.settingslib.R; +import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothBroadcastUtils; import com.android.settingslib.bluetooth.BluetoothUtils; diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java b/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java index 06f36194633..4af75ad5f90 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java @@ -22,7 +22,7 @@ import android.os.SystemProperties; import androidx.fragment.app.FragmentManager; -import com.android.settingslib.R; +import com.android.settings.R; import com.android.settingslib.core.lifecycle.ObservableActivity; import com.google.android.setupdesign.util.ThemeHelper; diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java index 0253aa6b748..b6f338ace69 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java @@ -39,8 +39,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.StringRes; +import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; -import com.android.settingslib.R; import com.android.settingslib.bluetooth.BluetoothBroadcastUtils; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.qrcode.QrCamera; diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java index e88b9cb6c74..cf7fafb35d1 100644 --- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java +++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java @@ -36,7 +36,7 @@ import android.widget.TextView; import com.android.internal.util.UserIcons; import com.android.internal.widget.RecyclerView; -import com.android.settingslib.R; +import com.android.settings.R; import com.android.settingslib.Utils; import java.util.ArrayList; diff --git a/src/com/android/settings/homepage/TopLevelHighlightMixin.java b/src/com/android/settings/homepage/TopLevelHighlightMixin.java index 9d727a51dd9..f361ed69831 100644 --- a/src/com/android/settings/homepage/TopLevelHighlightMixin.java +++ b/src/com/android/settings/homepage/TopLevelHighlightMixin.java @@ -69,17 +69,18 @@ public class TopLevelHighlightMixin implements Parcelable, DialogInterface.OnSho return 0; } - public static final Creator CREATOR = new Creator<>() { - @Override - public TopLevelHighlightMixin createFromParcel(Parcel source) { - return new TopLevelHighlightMixin(source); - } + public static final Creator CREATOR = + new Creator() { + @Override + public TopLevelHighlightMixin createFromParcel(Parcel source) { + return new TopLevelHighlightMixin(source); + } - @Override - public TopLevelHighlightMixin[] newArray(int size) { - return new TopLevelHighlightMixin[size]; - } - }; + @Override + public TopLevelHighlightMixin[] newArray(int size) { + return new TopLevelHighlightMixin[size]; + } + }; @Override public void onShow(DialogInterface dialog) { diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index 150dbe0483d..efc53b947d0 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -20,22 +20,15 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER; -import static android.os.UserHandle.USER_SYSTEM; -import android.Manifest; import android.app.INotificationManager; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.NotificationHistory; import android.app.NotificationManager; -import android.app.compat.CompatChanges; -import android.app.role.RoleManager; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; import android.companion.ICompanionDeviceManager; -import android.compat.annotation.ChangeId; -import android.compat.annotation.EnabledAfter; -import android.compat.annotation.EnabledSince; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -51,7 +44,6 @@ import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.provider.Settings; import android.service.notification.ConversationChannelWrapper; import android.service.notification.NotificationListenerFilter; import android.text.format.DateUtils; @@ -61,8 +53,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import com.android.internal.util.CollectionUtils; -import com.android.settingslib.R; -import com.android.settingslib.Utils; +import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.notification.ConversationIconFactory; diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java index f0046d793d0..9de7e0c9b12 100644 --- a/src/com/android/settings/notification/app/BubblePreference.java +++ b/src/com/android/settings/notification/app/BubblePreference.java @@ -22,7 +22,6 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED; import android.content.Context; import android.content.res.ColorStateList; -import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; @@ -31,8 +30,8 @@ import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; import com.android.settings.Utils; -import com.android.settingslib.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; diff --git a/src/com/android/settings/notification/app/ConversationPriorityPreference.java b/src/com/android/settings/notification/app/ConversationPriorityPreference.java index 67bffbf64b2..3e503a34c8f 100644 --- a/src/com/android/settings/notification/app/ConversationPriorityPreference.java +++ b/src/com/android/settings/notification/app/ConversationPriorityPreference.java @@ -24,7 +24,6 @@ import static android.view.View.VISIBLE; import android.content.Context; import android.content.res.ColorStateList; -import android.graphics.drawable.Drawable; import android.transition.AutoTransition; import android.transition.TransitionManager; import android.util.AttributeSet; @@ -37,8 +36,8 @@ import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; import com.android.settings.Utils; -import com.android.settingslib.R; public class ConversationPriorityPreference extends Preference { diff --git a/src/com/android/settings/notification/app/ImportancePreference.java b/src/com/android/settings/notification/app/ImportancePreference.java index d3cd0131081..857c94e06e9 100644 --- a/src/com/android/settings/notification/app/ImportancePreference.java +++ b/src/com/android/settings/notification/app/ImportancePreference.java @@ -27,21 +27,19 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.transition.AutoTransition; -import android.transition.Transition; import android.transition.TransitionManager; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import com.android.settings.Utils; -import com.android.settingslib.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settings.Utils; + public class ImportancePreference extends Preference { private boolean mIsConfigurable = true; diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index 505dc58b2cb..11ebd210d8f 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -37,8 +37,8 @@ import android.view.View; import androidx.annotation.VisibleForTesting; +import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settingslib.R; public class UsageGraph extends View { diff --git a/src/com/android/settings/widget/UsageView.java b/src/com/android/settings/widget/UsageView.java index 25bbbe3ec2a..6a721db0c84 100644 --- a/src/com/android/settings/widget/UsageView.java +++ b/src/com/android/settings/widget/UsageView.java @@ -28,7 +28,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.settingslib.R; +import com.android.settings.R; import java.util.Locale; diff --git a/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java b/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java index 1c069246449..54a4d04c68b 100644 --- a/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java +++ b/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java @@ -21,7 +21,7 @@ import android.view.View; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceViewHolder; -import com.android.settingslib.R; +import com.android.settings.R; import com.android.wifitrackerlib.WifiEntry; /** diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index 9581e7a6edb..d29482dfa22 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -29,7 +29,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import com.android.settings.LinkifyUtils; -import com.android.settingslib.R; +import com.android.settings.R; /** * A preference with a title that can have linkable content on click.