PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,260 Commits 1 Branch 0 Tags
f72035735ce66106adba4ea5ca2488a993dbb45c
Commit Graph

90260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
f72035735c Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp 2021-12-13 07:32:06 +00:00
Bonian Chen
5a36357d63 Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp 2021-12-13 07:32:06 +00:00
Jason Chiu
844a21e394 Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440317

Change-Id: I8a94d8977bd583a59ddd4a658ca50fd6708c2684
 2021-12-10 17:16:51 +00:00
Jason Chiu
d4b1048dbf Merge "Fix the highlight error after unfolding the device" into sc-v2-dev 2021-12-10 17:01:50 +00:00
TreeHugger Robot
5302093d5c Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138

Change-Id: Id8a2517aadca439e98c6ba978652689898b442fd
 2021-12-10 16:43:42 +00:00
TreeHugger Robot
56c49091a0 Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev 2021-12-10 16:28:29 +00:00
Jason Chiu
11d3b19c51 Fix the highlight error after unfolding the device 
Unfolding a device generates mutiple lifecycle events and resets the
highlight key.

Check if there's only one activity in the task and then perform the
reset.

Fix: 209016927
Test: manual
Change-Id: I49988fa913270d35a04436777433b7669afb72df
 2021-12-10 22:37:22 +08:00
SongFerng Wang
d7196d57b0 [automerger skipped] Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0 am: 80aafc5629 -s ours 
am skip reason: Merged-In Ie25b2ab4284d47abdd5db23676d05b6d547b2a73 with SHA-1 e53d70babc is already in history

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

Change-Id: I4f6270d4d2d79fec98b31a11d68cd8b230885c22
 2021-12-10 07:25:28 +00:00
SongFerng Wang
80aafc5629 Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818

Change-Id: If245b0d5fd4eeb161effae1c4f26c9cab6ed9860
 2021-12-10 07:12:54 +00:00
SongFerng Wang
095e4093b0 Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818

Change-Id: I33dcb20edcdd04ba2401df931ce8c345341ce3d2
 2021-12-10 06:57:58 +00:00
SongFerng Wang
04e416d68c Merge "[Settings] Avoid crash from rotation screen." 2021-12-10 06:33:59 +00:00
tom hsu
4a7f809e41 [Settings] Avoid crash from rotation screen. 
Bug: b/200822579
Test: Local test

Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
Merged-In: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
 2021-12-10 05:14:46 +00:00
Tsung-Mao Fang
edd47e0bdf Merge "Turn off deep link components by default" into sc-v2-dev am: c496858824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419878

Change-Id: I31adc78d2ccbdc72805278d6dcd2bf08a55ac785
 2021-12-10 03:50:32 +00:00
Jason Chiu
bd8f45b9d4 Fix the onCreate crash happened among zen mode rule pages 
Fix: 199229588
Test: manual
Change-Id: I7b0116de8d9760f420c026a8d65b019e6d2d00df
 2021-12-10 11:36:55 +08:00
Tsung-Mao Fang
c496858824 Merge "Turn off deep link components by default" into sc-v2-dev 2021-12-10 03:30:19 +00:00
TreeHugger Robot
b944d7f110 Merge "Move the text under slider bar to the description under title" into sc-v2-dev am: 0f0e27cf6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16379115

Change-Id: I5cf2e273ae5dda74a8491a85588e795203b73c43
 2021-12-10 01:23:35 +00:00
TreeHugger Robot
0f0e27cf6a Merge "Move the text under slider bar to the description under title" into sc-v2-dev 2021-12-10 01:03:24 +00:00
Joe Bolinger
a0fcc6e18e Update remove face enrollment strings for convenience. am: 493e889dd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Ib3901ce16b07b3ee5d8554cc62acae5bbf4a76d6
 2021-12-09 21:23:35 +00:00
Joe Bolinger
493e889dd6 Update remove face enrollment strings for convenience. 
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
 2021-12-09 19:24:27 +00:00
Joe Bolinger
2782c90f66 Merge "Update enrollment edu animation." into sc-v2-dev am: e8d9c1e1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16389834

Change-Id: I7c4794b8a5b385fc341e207384d91703a6e509af
 2021-12-09 18:38:40 +00:00
Joe Bolinger
e8d9c1e1d3 Merge "Update enrollment edu animation." into sc-v2-dev 2021-12-09 18:09:34 +00:00
Tom Hsu
7dc4aafbc6 Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev am: c51a58d819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16422508

Change-Id: I0c858bb26f99a4fc52955b6f513ff09c2e0c7d1e
 2021-12-09 16:25:00 +00:00
Tom Hsu
c51a58d819 Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev 2021-12-09 16:11:13 +00:00
TreeHugger Robot
2d9dc7df45 Merge "Set the package name to the deep link intent" into sc-v2-dev am: 46655e62ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426484

Change-Id: I34fb5b76c1a984f02995539d9ab6f0679a924ae4
 2021-12-09 15:19:13 +00:00
tom hsu
90274b2033 [Provider Model] fix incorrect signal icon on internet picker 
- Modify incorrect sub id to TelephonyManager

Bug: 204411539
Test: b/204411539#17
Change-Id: I7453267a1cd6158f03aa9b94f780fc2faa06d990
 2021-12-09 15:03:10 +00:00
TreeHugger Robot
46655e62ef Merge "Set the package name to the deep link intent" into sc-v2-dev 2021-12-09 15:01:26 +00:00
SongFerng Wang
d06e52bc4b Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: c350919fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182703

Change-Id: I0a22265ceeab9ccddca467338ed4a43f7636f3b7
 2021-12-09 14:49:14 +00:00
SongFerng Wang
c350919fa4 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev 2021-12-09 14:24:43 +00:00
TreeHugger Robot
9673300ea4 Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev am: 6dbc3835f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426486

Change-Id: Iadc95c4f5961003d562982148f9e916cf2cf97c6
 2021-12-09 13:16:54 +00:00
Jason Hsu
22d79fabb6 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877

Change-Id: I44ab328eff53752e188dd84e9284ff65686f7b64
 2021-12-09 13:16:26 +00:00
Alex Johnston
2dae4fdcc8 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours am: a418a3add2 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I200dd8595a060258e915803c87196ff1cf28822a
 2021-12-09 13:16:17 +00:00
Alex Johnston
f583dd9b48 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours am: 2e2c6def05 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: Ife35fe3502424e416fa273ce01b7a05d8a6127aa
 2021-12-09 13:16:10 +00:00
Alex Johnston
5d995a27fb [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours am: 51d6a6cc87 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: Ib23487c71a9611a9ffe85bb3403494961f995b85
 2021-12-09 13:14:44 +00:00
Alex Johnston
9cce03bd7f [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours am: fc4e559d89 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I57a454853de25105e7c124165ee92648620a42e3
 2021-12-09 13:14:35 +00:00
TreeHugger Robot
6dbc3835f8 Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev 2021-12-09 13:09:31 +00:00
Jason Hsu
dc0ee218e9 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev 2021-12-09 13:03:12 +00:00
Alex Johnston
51d6a6cc87 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I8dd11f5a4baec7dae48303a86373e446d24c5ac4
 2021-12-09 12:52:27 +00:00
Alex Johnston
a418a3add2 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I8f067f8e33a35eb03fb1fd15fcb631d7c0faf923
 2021-12-09 12:52:25 +00:00
Alex Johnston
fc4e559d89 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I500cca9261e8f5cda0851a8820e29147a8e16e00
 2021-12-09 12:52:21 +00:00
Alex Johnston
2e2c6def05 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I3d9ce05df1c0a3a596c46dce3f1f5fc839a263ba
 2021-12-09 12:52:20 +00:00
Alex Johnston
179d757227 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I2768955dccdde79767163ba69565f67a9646e8e9
 2021-12-09 12:37:18 +00:00
Alex Johnston
8d273f425e [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I1c7f2a199b03858a67d999060a57b14fbe4c5dfb
 2021-12-09 12:37:12 +00:00
Alex Johnston
76870c6509 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e -s ours am: ab28d070b4 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157 is already in history

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

Change-Id: I9db20a1e0edc8eb1e51abaea77693f207d9e683a
 2021-12-09 12:36:27 +00:00
Alex Johnston
64f416950d [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e am: 6b792ce56b -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157 is already in history

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

Change-Id: I63216f302139b131c1f316f06dedf73681d3b9aa
 2021-12-09 12:32:09 +00:00
Bonian Chen
e8711bd32c [Settings] Fix failure test case 
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950)
 2021-12-09 12:28:47 +00:00
Alex Johnston
6b792ce56b Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: I02c96d91aa737bbe07fe6095be07eda384cc3a17
 2021-12-09 12:21:39 +00:00
Alex Johnston
ab28d070b4 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157 is already in history

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

Change-Id: I151c19730fffe923ad1be87430c43301dad46ebc
 2021-12-09 12:21:28 +00:00
Alex Johnston
edb4843063 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I57cd5f04f66b1874bf1d1e1c164eba7789af9ad8
 2021-12-09 12:21:13 +00:00
Alex Johnston
a849920dce [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: Ia158b48a9af8910eff034da0847b1d43aa2dc3a7
 2021-12-09 12:19:33 +00:00
Alex Johnston
c745bc427e Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: Ib4a03feff7c118afaeae5553f94d9915881c2e4e
 2021-12-09 12:05:20 +00:00