Commit Graph

97643 Commits

Author SHA1 Message Date
TreeHugger Robot
93fe396f23 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8 am: 6c3734f130
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I5f1a93b54e13310bfb07d34de09cd0552bf3fbcc
2021-11-03 20:01:20 +00:00
TreeHugger Robot
6c3734f130 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: Ie4a8948cd5f79d4fcaf4aff23fa48a73c60305cd
2021-11-03 19:48:36 +00:00
TreeHugger Robot
3e23903ff8 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev 2021-11-03 19:29:35 +00:00
Bill Yi
d306a89a16 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours am: 1b281028c2 -s ours am: 4ae59680fb -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: I18812f3c05bb0e44497a9a5137efe009f42286d0
2021-11-03 19:25:24 +00:00
Bill Yi
4ae59680fb [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours am: 1b281028c2 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: Ie83f174bb5e63301f3ed7735eb22a6372adbbc7b
2021-11-03 19:06:43 +00:00
Bill Yi
1b281028c2 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b
2021-11-03 18:46:14 +00:00
Bill Yi
56abf6d05d [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: Icc33406e496cfc45f87c8fc7fbc739d08b0f4ca0
2021-11-03 18:25:45 +00:00
Bill Yi
eda6485a4b [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Jason Chiu
999a467e7c Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c am: 3b3203cd50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571

Change-Id: I65dd85d6ab63588900d367b52ec927a7cd9fa534
2021-11-03 12:34:57 +00:00
Jason Chiu
3b3203cd50 Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571

Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
2021-11-03 12:23:46 +00:00
Jason Chiu
80dd47633c Merge "Search experience improvement for large screen" into sc-v2-dev 2021-11-03 12:08:35 +00:00
Jason Chiu
e427cc6752 Search experience improvement for large screen
- Support fragment and direct link in SearchResultTrampoline
- Start activity for SI case and start deep link trampoline for others
- Disable menu highlight whenever the search bar is clicked
- Don't overwrite SettingsApplication's homepage activity in
  SliceDeepLinkHomepageActivity
- Scroll to highlighted menu entry after homepage is loaded to prevent
  UI overlapping

Bug: 201724410
Test: manual, robotest build pass
Change-Id: I5115d17d829e85036000da2e80f0e5b0598c733f
2021-11-03 18:44:01 +08:00
Tom Hsu
9c39878c50 Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev am: 0ad93a95c6 am: acfbe351eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174733

Change-Id: I0f1676cc4d5501a19bed817a5b554652756ef0d7
2021-11-03 07:52:13 +00:00
Tom Hsu
acfbe351eb Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev am: 0ad93a95c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174733

Change-Id: I1ba69fa41b9781be762c45577b6a44546ac4e409
2021-11-03 07:32:45 +00:00
Tom Hsu
0ad93a95c6 Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev 2021-11-03 07:15:24 +00:00
Wesley Wang
0f3a672a94 Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad am: e67f12f9b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I1f9c5dd515fa42c7a30f86f9c7b135b39ff67cc5
2021-11-03 07:06:04 +00:00
Jason Chiu
d13834de52 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 am: 56dde819dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
2021-11-03 07:05:55 +00:00
Wesley Wang
e67f12f9b7 Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I033d0ff341cae7cdb320abebfd1da765c6fa8e74
2021-11-03 06:55:06 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Wesley Wang
bf9f91f0ad Merge "Move optimization mode backup timing into onPause" into sc-v2-dev 2021-11-03 06:41:42 +00:00
Jason Chiu
1565bba600 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev 2021-11-03 06:38:46 +00:00
TreeHugger Robot
6d2db7a8cf Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0 am: 3be2b733f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I66ecbb8213e9fb6301d75cacb493813180df1e18
2021-11-03 05:41:03 +00:00
TreeHugger Robot
3be2b733f2 Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0 Merge "Adjust optimize page logging timing" into sc-v2-dev 2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3 Move optimization mode backup timing into onPause
- Move to onPause to avoid some corner case (like kill apps from recent
 app won't trigger onDestroy)

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
2021-11-03 12:38:10 +08:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
2021-11-02 21:07:55 -07:00
Wesley.CW Wang
7fb4cbf005 Adjust optimize page logging timing
- Log the optimize mode only when leave this page and mode changed
 - Update mOptimizationMode at onResume to make sure the state is sync
 with framework

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iab116220cd7d2b1bdb1c170c4b47016c763bf4fe
2021-11-03 12:05:15 +08:00
The Android Open Source Project
c77286a817 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours am: 27067e7dd8 -s ours am: 4259d34ac9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212

Change-Id: I8739290c19ecdc17007920b97e669f6ffdc83c8c
2021-11-03 00:47:29 +00:00
The Android Open Source Project
4259d34ac9 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours am: 27067e7dd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212

Change-Id: I59009ecba231ac505949339e4ba3fcd48db9a4a7
2021-11-03 00:30:55 +00:00
The Android Open Source Project
27067e7dd8 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212

Change-Id: If522424ffa85db50121cc40410ed12394a5b8af0
2021-11-03 00:12:29 +00:00
The Android Open Source Project
51c0a2cb6e [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212

Change-Id: Iced88b946a227a369a465b018226d38b9fb69c43
2021-11-02 23:55:40 +00:00
TreeHugger Robot
e5129de80c Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103 am: edc39b86fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210

Change-Id: Ifb4b6b78520b58dafde517e68589033b18de0305
2021-11-02 23:02:53 +00:00
TreeHugger Robot
edc39b86fc Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210

Change-Id: Ie4cd9c0a1d93bf325356c7538e891a815c6a2edf
2021-11-02 22:45:10 +00:00
TreeHugger Robot
2fa408c103 Merge "Add intent action to launch face enrollment" into sc-v2-dev 2021-11-02 22:32:27 +00:00
Curtis Belmonte
3de8abe8ee Add intent action to launch face enrollment
Test: adb shell am start -a android.settings.FACE_ENROLL

Bug: 204100385
Change-Id: I3ac4395d80f0c36e8cab3b068c51ce03d0ecad7b
2021-11-02 14:18:11 -07:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
2021-11-02 14:11:57 -07:00
Julia Reynolds
66cffd469f Merge "Migrate to using fixed permissions" 2021-11-02 20:47:58 +00:00
ykhung
e7d4fefde0 Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a am: b85bf67314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737

Change-Id: I210c941a06b9d905bb8b37500377ad088f1d3230
2021-11-02 18:25:27 +00:00
ykhung
b85bf67314 Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737

Change-Id: I06e12f5250b7abe8ce5546cf3c91952f6704fe6e
2021-11-02 18:13:07 +00:00
ykhung
8f0291cd1a Fix NPE issue of usage detailed page learn more button click event
root cause: some OEMs can not provide valid intent for help & feedback
solution: check the intent is vaild or not before show up the help content

Bug: 204844010
Test: make RunSettingsRoboTests
Change-Id: I4e7a7c926205be1179d55d33ada345024c8a44ab
2021-11-02 16:34:34 +00:00
tom hsu
e53d70babc [Settings] Avoid crash from rotation screen.
Bug: b/200822579
Test: Local test

Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
2021-11-02 12:36:49 +00:00
ykhung
f5d2293cf3 Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5 am: 00bc734b6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323

Change-Id: Ifa6ecd6da1d6cc2c577aa8bcd4aa7c2e97c65cb6
2021-11-02 10:43:34 +00:00
ykhung
00bc734b6a Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323

Change-Id: Ibcf69b3ff520458b486fdecd0ec92d8983167bac
2021-11-02 10:30:50 +00:00
ykhung
ae5bddc5e5 Avoid intermediate touch hover effect when a11y is enabled
Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I08e64a73547f71281fa94dc56ba8fe08312ebed0
2021-11-02 16:47:31 +08:00
Jason Chiu
7f6b9e26c9 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32 Merge changes from topic "slice-highlight" into sc-v2-dev
* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
Jason Chiu
ae5f30b15a Merge "Declare a highlight menu key for ButtonNavigationSettingsAssistController" 2021-11-02 02:14:09 +00:00