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

Use resource processor for Settings

Browse Source 
Bug: 293810334
Test: m Settings
Test: robotests
Change-Id: Ie515e137648eddfdfcab5e8095f5be99721d9e1b
This commit is contained in:
Chaohui Wang
2023-08-11 13:43:02 +08:00
parent b199f3512a
commit 2cab62254c
35 changed files with 114 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
View File

@@ -50,9 +50,9 @@ import com.google.android.setupdesign.template.RequireScrollMixin
import com.google.android.setupdesign.util.DeviceHelper
import com.google.android.setupdesign.util.DynamicColorPalette
import com.google.android.setupdesign.util.DynamicColorPalette.ColorType.ACCENT
import java.util.function.Supplier
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import java.util.function.Supplier
/**
* Fingerprint intro onboarding page fragment implementation
@@ -324,6 +324,6 @@ fun FragmentActivity.bindFingerprintEnrollIntroView(
)
}
view.findViewById<ScrollView>(R.id.sud_scroll_view)?.importantForAccessibility =
View.IMPORTANT_FOR_ACCESSIBILITY_YES
view.findViewById<ScrollView>(com.google.android.setupdesign.R.id.sud_scroll_view)
?.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
}

6
src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt
View File

@@ -18,12 +18,10 @@ package com.android.settings.remoteauth.finish
import android.os.Bundle
import android.view.View
import com.airbnb.lottie.LottieAnimationView
import com.android.settings.R
import com.android.settings.remoteauth.RemoteAuthEnrollBase
import com.android.settingslib.widget.LottieColorUtils
import com.airbnb.lottie.LottieAnimationView
import com.google.android.setupcompat.template.FooterButton
/**
@@ -45,7 +43,7 @@ class RemoteAuthEnrollFinish :
.setText(R.string.security_settings_remoteauth_enroll_finish_btn_next)
.setListener(this::onPrimaryFooterButtonClick)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SudGlifButton_Primary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()
}

4
src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt
View File

@@ -49,7 +49,7 @@ class RemoteAuthEnrollIntroduction :
.setText(R.string.security_settings_remoteauth_enroll_introduction_agree)
.setListener(::onPrimaryFooterButtonClick)
.setButtonType(FooterButton.ButtonType.OPT_IN)
.setTheme(R.style.SudGlifButton_Primary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()
}
@@ -58,7 +58,7 @@ class RemoteAuthEnrollIntroduction :
.setText(R.string.security_settings_remoteauth_enroll_introduction_disagree)
.setListener(::onSecondaryFooterButtonClick)
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(R.style.SudGlifButton_Primary)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()
}

4
src/com/android/settings/search/actionbar/SearchMenuController.java
View File

@@ -86,8 +86,8 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
return;
}
final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
R.string.search_menu);
searchItem.setIcon(R.drawable.ic_search_24dp);
com.android.settingslib.search.R.string.search_menu);
searchItem.setIcon(com.android.settingslib.search.R.drawable.ic_search_24dp);
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
searchItem.setOnMenuItemClickListener(target -> {