Jason Hsu
5b240cfa7d
Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592
am: f6f978ec38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242
Change-Id: If2a8c089ab2a3d105e870fa40fe1dd16f8bfbed2
2021-12-15 06:40:22 +00:00
Jason Hsu
f6f978ec38
Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242
Change-Id: Ie87bc598fbba95ef042b3be813801a437adeace3
2021-12-15 06:23:47 +00:00
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
Zoey Chen
d35ea04c83
Merge "[Settings] Remove the legacy 2-pane registration"
2021-12-15 03:26:38 +00:00
Xin Li
370ab66900
[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11
-s ours am: 50d6b616d7
-s ours am: 54916e10e8
-s ours am: 539e62512b
-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: I0cea6e259417d2a643b2176f3a9a8e0641c4ecb3
2021-12-14 22:18:50 +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
Zoey Chen
2c1fe3ca47
[Settings] Remove the legacy 2-pane registration
...
Test: atest
Bug: 209606859
Change-Id: Ia1788cdfd9a9e4c6bfeb25be1257f82900867114
2021-12-14 12:32:34 +08:00
Bonian Chen
c0572ddaa7
Merge "[Settings] Fix failure test case" am: 57a7978f8c
am: 54ee717db8
am: 718c17039e
am: 29863c9d8d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: Icae124324889814429e85c6a4fef78a58e1b6850
2021-12-14 03:03:58 +00:00
Bonian Chen
f0b73cabf7
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
am: 54e4845d54
am: 2bed540284
am: 6418f1822d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: I3cdfc7fe343d68f0c10b733a367f56669a8a7b4e
2021-12-14 03:03:34 +00:00
SongFerng Wang
d42db7ebbf
[automerger skipped] Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
am: a74e6cd2ec
am: 38a109d745
am: 81d58df274
-s ours
...
am skip reason: Merged-In Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5 with SHA-1 19a5b81eb0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: I90c26f124e0c8514759a27dfa2c96f623e268887
2021-12-14 03:02:02 +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
SongFerng Wang
f0b89531b2
Merge "To disable the preferred network mode UI during calling."
2021-12-13 18:53:01 +00:00
Treehugger Robot
06504aeb5f
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
am: 43c08cc42f
am: 38d4bfc954
am: d3548f5ac3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: I2f1db1fb485603284d060fd1d7359047d80886a0
2021-12-13 15:43:42 +00: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
Bonian Chen
7b4ba32bbe
Merge "[Settings] Fix failure test case" into sc-v2-dev am: 4b9b6b632a
am: 5b9bb1ea02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430896
Change-Id: I3a2e04b99e58a24206a8e5cce132026de92af733
2021-12-13 15:03:32 +00:00
Bonian Chen
b4d099c0c8
[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450f9
-s ours am: 7fe06efc03
-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: I16abb6fe7c029e2b750c84a9bf3dc00a35244be2
2021-12-13 15:03:27 +00:00
tom hsu
58244b1b74
[Panlingual] Implement entries of Panlingual in settings UI part.
...
- Path 1 : System -> Language & Input -> App Languages -> per app
language
- path 2 : System -> Apps -> App Info -> per app language
Video: https://screencast.googleplex.com/cast/NjUyNTUzMDY0MTc5MzAyNHxjNTg2MzMwYS0yOA
Bug: 206854105
Test: local test pass
Test: atest pass
Change-Id: Ic06fa4f0c6ec68680eb828032b6e3f479b412dc4
2021-12-13 22:54:40 +08: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
f731c74fb4
Merge "[Settings] Support phone number talkback" into sc-v2-dev am: 14d03e77ad
am: 3900342c14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430899
Change-Id: Ib1c74a5099164c0c31dc2c0dd3398c714195dac3
2021-12-13 10:01:17 +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
Zoey Chen
a6c50cac45
Merge changes Icda934a2,Ic07b18b3
...
* changes:
[Large Screen] Launch MobileNetworkSettings by SubSettingsLauncher
[Large Screen] Launch MobileNetworkActivity as a fragment for split mode
2021-12-13 09:25:38 +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
d6482baa2b
Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp am: f72035735c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430897
Change-Id: I21cd55b4a400e1a87745b9d1aca6cc1ecc7d45b3
2021-12-13 07:46:59 +00:00
Bonian Chen
b99a56d3f5
[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp am: 5a36357d63
-s ours
...
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 8a892271da
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16401525
Change-Id: I33b3302bcae2d8d70fb9a0de05e487e40a1444f1
2021-12-13 07:46:55 +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