Update to preference 1.3
Update code that is blocking the upgrade to preference 1.3
Fix: 292152319
Test: atest HealthConnectControllerUITests
Change-Id: I53c5fa06f2f8f50ec35887a46e9179c8fc45f6fa
Merged-In: I53c5fa06f2f8f50ec35887a46e9179c8fc45f6fa
(cherry picked from commit b0b2f5f0083816233206e6b3c31bdc84fc7af01e)
diff --git a/apk/src/com/android/healthconnect/controller/autodelete/AutoDeleteRangePickerPreference.kt b/apk/src/com/android/healthconnect/controller/autodelete/AutoDeleteRangePickerPreference.kt
index 83bcb2e..6c38250 100644
--- a/apk/src/com/android/healthconnect/controller/autodelete/AutoDeleteRangePickerPreference.kt
+++ b/apk/src/com/android/healthconnect/controller/autodelete/AutoDeleteRangePickerPreference.kt
@@ -54,10 +54,10 @@
key = AUTO_DELETE_RANGE_PICKER_PREFERENCE_KEY
}
- override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+ override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
- val widgetFrame: ViewGroup = holder?.findViewById(android.R.id.widget_frame) as ViewGroup
+ val widgetFrame: ViewGroup = holder.findViewById(android.R.id.widget_frame) as ViewGroup
val widgetFrameParent: LinearLayout = widgetFrame.parent as LinearLayout
val iconFrame: LinearLayout? = holder.findViewById(android.R.id.icon_frame) as LinearLayout?
diff --git a/apk/src/com/android/healthconnect/controller/autodelete/HeaderPreference.kt b/apk/src/com/android/healthconnect/controller/autodelete/HeaderPreference.kt
index 53d9ee2..93ea942 100644
--- a/apk/src/com/android/healthconnect/controller/autodelete/HeaderPreference.kt
+++ b/apk/src/com/android/healthconnect/controller/autodelete/HeaderPreference.kt
@@ -31,10 +31,10 @@
class HeaderPreference constructor(context: Context, private val activity: FragmentActivity) :
Preference(context) {
- override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+ override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
- val widgetFrame: ViewGroup = holder?.findViewById(android.R.id.widget_frame) as ViewGroup
+ val widgetFrame: ViewGroup = holder.findViewById(android.R.id.widget_frame) as ViewGroup
val widgetFrameParent: LinearLayout = widgetFrame.parent as LinearLayout
val iconFrame: LinearLayout? = holder.findViewById(android.R.id.icon_frame) as LinearLayout?
widgetFrameParent.removeView(iconFrame)
diff --git a/apk/src/com/android/healthconnect/controller/dataentries/units/UnitsFragment.kt b/apk/src/com/android/healthconnect/controller/dataentries/units/UnitsFragment.kt
index 0501a7d..e5598b2 100644
--- a/apk/src/com/android/healthconnect/controller/dataentries/units/UnitsFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/dataentries/units/UnitsFragment.kt
@@ -145,7 +145,7 @@
unitValue: String,
onNewValue: (String) -> Unit
): ListPreference {
- val listPreference = ListPreference(context)
+ val listPreference = ListPreference(requireContext())
logger.logImpression(logName)
with(listPreference) {
diff --git a/apk/src/com/android/healthconnect/controller/home/HomeFragment.kt b/apk/src/com/android/healthconnect/controller/home/HomeFragment.kt
index f446962..c146b8f 100644
--- a/apk/src/com/android/healthconnect/controller/home/HomeFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/home/HomeFragment.kt
@@ -155,7 +155,7 @@
MigrationState.MODULE_UPGRADE_REQUIRED,
MigrationState.APP_UPGRADE_REQUIRED -> {
migrationBanner = getMigrationBanner()
- preferenceScreen.addPreference(migrationBanner)
+ preferenceScreen.addPreference(migrationBanner as BannerPreference)
}
MigrationState.COMPLETE -> {
maybeShowWhatsNewDialog(requireContext())
diff --git a/apk/src/com/android/healthconnect/controller/migration/MigrationNavigationFragment.kt b/apk/src/com/android/healthconnect/controller/migration/MigrationNavigationFragment.kt
index 0743356..8adeaa9 100644
--- a/apk/src/com/android/healthconnect/controller/migration/MigrationNavigationFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/migration/MigrationNavigationFragment.kt
@@ -23,7 +23,7 @@
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
- ): View? {
+ ): View {
return inflater.inflate(R.layout.fragment_migration_navigation, container, false)
}
diff --git a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/ConnectedAppsFragment.kt b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/ConnectedAppsFragment.kt
index 6154ac2..c428c6b 100644
--- a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/ConnectedAppsFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/ConnectedAppsFragment.kt
@@ -85,28 +85,28 @@
private val viewModel: ConnectedAppsViewModel by viewModels()
private lateinit var searchMenuItem: MenuItem
- private val mTopIntro: TopIntroPreference? by lazy {
- preferenceScreen.findPreference(TOP_INTRO)
+ private val mTopIntro: TopIntroPreference by lazy {
+ preferenceScreen.findPreference(TOP_INTRO)!!
}
- private val mAllowedAppsCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(ALLOWED_APPS_CATEGORY)
+ private val mAllowedAppsCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(ALLOWED_APPS_CATEGORY)!!
}
- private val mNotAllowedAppsCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(NOT_ALLOWED_APPS)
+ private val mNotAllowedAppsCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(NOT_ALLOWED_APPS)!!
}
- private val mInactiveAppsCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(INACTIVE_APPS)
+ private val mInactiveAppsCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(INACTIVE_APPS)!!
}
- private val mThingsToTryCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(THINGS_TO_TRY)
+ private val mThingsToTryCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(THINGS_TO_TRY)!!
}
- private val mSettingsAndHelpCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(SETTINGS_AND_HELP)
+ private val mSettingsAndHelpCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(SETTINGS_AND_HELP)!!
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -271,7 +271,7 @@
}
private fun getNoAppsPreference(@StringRes res: Int): Preference {
- return Preference(context).also {
+ return Preference(requireContext()).also {
it.setTitle(res)
it.isSelectable = false
}
diff --git a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/HealthAppPreference.kt b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/HealthAppPreference.kt
index a170035..8e6b298 100644
--- a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/HealthAppPreference.kt
+++ b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/HealthAppPreference.kt
@@ -49,11 +49,11 @@
}
override fun setOnPreferenceClickListener(
- onPreferenceClickListener: OnPreferenceClickListener
+ onPreferenceClickListener: OnPreferenceClickListener?
) {
val loggingClickListener = OnPreferenceClickListener {
logger.logInteraction(logName)
- onPreferenceClickListener.onPreferenceClick(it)
+ onPreferenceClickListener?.onPreferenceClick(it) ?: false
}
super.setOnPreferenceClickListener(loggingClickListener)
}
@@ -67,7 +67,7 @@
return preference is HealthAppPreference && appMetadata == preference.appMetadata
}
- override fun onBindViewHolder(view: PreferenceViewHolder?) {
+ override fun onBindViewHolder(view: PreferenceViewHolder) {
super.onBindViewHolder(view)
}
}
diff --git a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/SettingsManagePermissionFragment.kt b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/SettingsManagePermissionFragment.kt
index 4799eb1..327cbaf 100644
--- a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/SettingsManagePermissionFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/SettingsManagePermissionFragment.kt
@@ -166,7 +166,7 @@
}
private fun getNoAppsPreference(@StringRes res: Int): Preference {
- return Preference(context).also {
+ return Preference(requireContext()).also {
it.setTitle(res)
it.isSelectable = false
}
diff --git a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/searchapps/SearchAppsFragment.kt b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/searchapps/SearchAppsFragment.kt
index c9a864b..a683b98 100644
--- a/apk/src/com/android/healthconnect/controller/permissions/connectedapps/searchapps/SearchAppsFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/permissions/connectedapps/searchapps/SearchAppsFragment.kt
@@ -59,20 +59,20 @@
private var searchView: SearchView? = null
private val viewModel: ConnectedAppsViewModel by viewModels()
- private val allowedAppsCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(ALLOWED_APPS_CATEGORY)
+ private val allowedAppsCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(ALLOWED_APPS_CATEGORY)!!
}
- private val notAllowedAppsCategory: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(NOT_ALLOWED_APPS)
+ private val notAllowedAppsCategory: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(NOT_ALLOWED_APPS)!!
}
- private val inactiveAppsPreference: PreferenceGroup? by lazy {
- preferenceScreen.findPreference(INACTIVE_APPS)
+ private val inactiveAppsPreference: PreferenceGroup by lazy {
+ preferenceScreen.findPreference(INACTIVE_APPS)!!
}
- private val emptySearchResultsPreference: NoSearchResultPreference? by lazy {
- preferenceScreen.findPreference(EMPTY_SEARCH_RESULT)
+ private val emptySearchResultsPreference: NoSearchResultPreference by lazy {
+ preferenceScreen.findPreference(EMPTY_SEARCH_RESULT)!!
}
- private val topIntroPreference: TopIntroPreference? by lazy {
- preferenceScreen.findPreference(TOP_INTRO_PREF)
+ private val topIntroPreference: TopIntroPreference by lazy {
+ preferenceScreen.findPreference(TOP_INTRO_PREF)!!
}
private val menuProvider =
diff --git a/apk/src/com/android/healthconnect/controller/recentaccess/RecentAccessFragment.kt b/apk/src/com/android/healthconnect/controller/recentaccess/RecentAccessFragment.kt
index 5520c62..8682e93 100644
--- a/apk/src/com/android/healthconnect/controller/recentaccess/RecentAccessFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/recentaccess/RecentAccessFragment.kt
@@ -82,7 +82,7 @@
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
- ): View? {
+ ): View {
val rootView = super.onCreateView(inflater, container, savedInstanceState)
contentParent = requireActivity().findViewById(android.R.id.content)
diff --git a/apk/src/com/android/healthconnect/controller/shared/inactiveapp/InactiveAppPreference.kt b/apk/src/com/android/healthconnect/controller/shared/inactiveapp/InactiveAppPreference.kt
index b9c29b9..6573434 100644
--- a/apk/src/com/android/healthconnect/controller/shared/inactiveapp/InactiveAppPreference.kt
+++ b/apk/src/com/android/healthconnect/controller/shared/inactiveapp/InactiveAppPreference.kt
@@ -49,10 +49,10 @@
logger.logImpression(logName)
}
- override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+ override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
- val widgetFrame: ViewGroup? = holder?.findViewById(android.R.id.widget_frame) as ViewGroup?
+ val widgetFrame: ViewGroup? = holder.findViewById(android.R.id.widget_frame) as ViewGroup?
widgetFrame?.setOnClickListener(deleteButtonListener)
val widgetFrameParent: ViewGroup? = widgetFrame?.parent as ViewGroup?
diff --git a/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreference.kt b/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreference.kt
index 71abfc2..6178e7a 100644
--- a/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreference.kt
+++ b/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreference.kt
@@ -55,11 +55,11 @@
// }
override fun setOnPreferenceClickListener(
- onPreferenceClickListener: OnPreferenceClickListener
+ onPreferenceClickListener: OnPreferenceClickListener?
) {
val loggingClickListener = OnPreferenceClickListener {
logger.logInteraction(logName)
- onPreferenceClickListener.onPreferenceClick(it)
+ onPreferenceClickListener?.onPreferenceClick(it) ?: false
}
super.setOnPreferenceClickListener(loggingClickListener)
}
diff --git a/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreferenceFragment.kt b/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreferenceFragment.kt
index f78b8dc..50241f4 100644
--- a/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreferenceFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/shared/preference/HealthPreferenceFragment.kt
@@ -72,7 +72,7 @@
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
- ): View? {
+ ): View {
logger.setPageId(pageName)
val rootView =
inflater.inflate(R.layout.preference_frame, container, /*attachToRoot */ false)
@@ -96,7 +96,7 @@
preferenceManager.preferenceComparisonCallback = HealthPreferenceComparisonCallback()
}
- override fun onCreateAdapter(preferenceScreen: PreferenceScreen?): RecyclerView.Adapter<*> {
+ override fun onCreateAdapter(preferenceScreen: PreferenceScreen): RecyclerView.Adapter<*> {
val adapter = super.onCreateAdapter(preferenceScreen)
/* By default, the PreferenceGroupAdapter does setHasStableIds(true). Since each Preference
* is internally allocated with an auto-incremented ID, it does not allow us to gracefully
