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

90657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hsu
4ae25ef592 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev 2021-12-15 06:11:18 +00:00
Xin Li
539e62512b [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours am: 54916e10e8 -s ours 
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I39022c9f6e91c2722d2f78e8f19da0cd96488532
 2021-12-14 21:51:00 +00:00
Xin Li
54916e10e8 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours 
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I5eeeaca9b47404dafc838583ff60cabf80184161
 2021-12-14 21:24:07 +00:00
Xin Li
50d6b616d7 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours 
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I14e4d4bad0bf56de1031170010143763bcb4300d
 2021-12-14 21:00:16 +00:00
Xin Li
798e3d7d11 Merge "Merge Android 12 QPR1" 2021-12-14 20:26:01 +00:00
Xin Li
475d27801f Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
 2021-12-14 08:39:13 -08:00
Jason Hsu
8eb2aeafa4 Revert "Add new string to hint user of triple-tap shortcut delay" 
This reverts commit dc156e77b4.

Reason for revert: New flow for magnification switch shortcut need to be fine-tuned again. Punt this flow to Android T, so revert the string.

Change-Id: Ieb48b8e3e34b96130193cf8499ff8f49e5954b1f
 2021-12-14 09:39:01 +00:00
Bonian Chen
29863c9d8d Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 am: 718c17039e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I8a84ff16006d462a0afef993132bfb081eff1537
 2021-12-14 02:53:55 +00:00
Bonian Chen
6418f1822d Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 am: 2bed540284 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I52e8fc8a2ec4529d94b36d9a7d4697d82d88b118
 2021-12-14 02:53:53 +00:00
Bonian Chen
718c17039e Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I2da154061359ad72ffa736873f06052be93ed721
 2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
 2021-12-14 02:46:04 +00:00
SongFerng Wang
81d58df274 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec am: 38a109d745 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ie25bb9a2faee5e4ed58591e903778e3db21ef838
 2021-12-14 02:44:15 +00:00
Bonian Chen
54ee717db8 Merge "[Settings] Fix failure test case" am: 57a7978f8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
 2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
 2021-12-14 02:30:53 +00:00
SongFerng Wang
38a109d745 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
 2021-12-14 02:22:54 +00:00
Bonian Chen
57a7978f8c Merge "[Settings] Fix failure test case" 2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc Merge "[Settings] Refactor Wifi Calling description text" 2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec Merge "To disable the preferred network mode UI during calling." am: 9dec28892c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
 2021-12-14 01:58:22 +00:00
SongFerng Wang
9dec28892c Merge "To disable the preferred network mode UI during calling." 2021-12-14 01:40:36 +00:00
SongFerngWang
ce7d4b730c To disable the preferred network mode UI during calling. 
It is the modem limitation, so disable the preferred network mode UI
during calling.

Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
 2021-12-14 04:16:44 +08:00
Treehugger Robot
d3548f5ac3 Merge "Set the EID in the SIM status page to be copyable" am: eba925809d am: 43c08cc42f am: 38d4bfc954 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: I022e833b6ffbb07055fb52234a9ca4de0b394a22
 2021-12-13 15:26:45 +00:00
Treehugger Robot
38d4bfc954 Merge "Set the EID in the SIM status page to be copyable" am: eba925809d am: 43c08cc42f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Ib89b68b80bbfec649ddf54b50de568c94ce8d6b3
 2021-12-13 15:03:49 +00:00
Treehugger Robot
43c08cc42f Merge "Set the EID in the SIM status page to be copyable" am: eba925809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
 2021-12-13 14:48:47 +00:00
Bonian Chen
5b9bb1ea02 Merge "[Settings] Fix failure test case" into sc-v2-dev am: 4b9b6b632a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430896

Change-Id: If58037882a6c4ee60cb799cd9d8b673097d87ea9
 2021-12-13 14:48:27 +00:00
Bonian Chen
7fe06efc03 [automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450f9 -s ours 
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 5de864ae93 is already in history

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

Change-Id: I0f7920647fa91ff0bf49ce3f4e4133e5d0e72645
 2021-12-13 14:48:21 +00:00
Treehugger Robot
eba925809d Merge "Set the EID in the SIM status page to be copyable" 2021-12-13 14:25:11 +00:00
Bonian Chen
4b9b6b632a Merge "[Settings] Fix failure test case" into sc-v2-dev 2021-12-13 14:19:44 +00:00
Bonian Chen
05836450f9 Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev 2021-12-13 14:19:44 +00:00
Bonian Chen
3900342c14 Merge "[Settings] Support phone number talkback" into sc-v2-dev am: 14d03e77ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430899

Change-Id: I4492b8cd17c4ad4b288a356722a92936d97898f5
 2021-12-13 09:46:35 +00:00
Bonian Chen
14d03e77ad Merge "[Settings] Support phone number talkback" into sc-v2-dev 2021-12-13 09:23:17 +00:00
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 thedjoisworo
5923723b4d Set the EID in the SIM status page to be copyable 
Add new textIsSelectable attributes to the EID textview

Bug: 210374141
Change-Id: I3b4f223319ee0ab8ae89dc2b0984ae9f9dbe32ae
 2021-12-13 06:39:20 +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