Chaohui Wang
64774540f2
Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297
Change-Id: Icd2c470bbbc7144404b513beef5c6785eab8ca86
2022-03-07 13:06:22 +00:00
Chaohui Wang
18e2057de2
Merge "Fix Other default preferences alignment" am: c73dfdb858
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297
Change-Id: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
2022-03-07 12:41:09 +00:00
Chaohui Wang
71f2d6d44c
Fix Other default preferences alignment
...
Bug: 222333696
Change-Id: Icdcfff728c891b81d3976f3d625aa93b5154198c
Test: Manual on Pixel device
2022-03-07 09:36:14 +00:00
Tom Hsu
293571f054
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
2022-03-02 11:59:46 +00:00
tom hsu
427906c29e
[Tetheirng] Show a dialog indicate tethering is unsupported by carrier.
...
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
2022-03-01 18:10:10 +08:00
Presubmit Automerger Backend
0b843be422
[automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Bug: 220144337
Change-Id: If4e3bf2b07f7d5ce4121866a2d7cd26d91fb4a82
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
2022-02-23 15:43:46 +00:00
Evan Laird
16148d2c8c
Add setting for showing the vibrate icon in status bar
...
Test: manual
Bug: 220144337
Change-Id: I2d389d71dd9402353b058039464495a1d33ef0e9
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
2022-02-23 15:43:37 +00:00
Xin Li
b9e9ca119c
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
...
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
2022-02-11 07:29:32 +00:00
Xin Li
3160c1adb3
Merge SQ1A.220205.002
...
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
2022-02-07 23:19:53 -08:00
TreeHugger Robot
71bf163671
Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev am: a4a8d64edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16634156
Change-Id: I41bc13353be755ab1459511d6da515587df2eb24
2022-01-28 21:19:24 +00:00
TreeHugger Robot
a4a8d64edc
Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev
2022-01-28 21:03:47 +00:00
TreeHugger Robot
4636172136
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-26 16:53:16 +00:00
Bill Yi
c556615f57
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic56844c2efc174d299775ff03b2abc3f10d49de9
2022-01-25 06:32:40 +00:00
Bill Yi
2953e0c45f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e9c6c97c110158c929e9b80da1f105a6182644d
2022-01-25 06:18:14 +00:00
Joshua Mccloskey
80670f39c9
Merge "Added lottie animations for udfps side/tip" into sc-v2-dev am: 6a6fb6b78b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440683
Change-Id: I2e39ea48ae3511e9111dacd09b9381386763d33d
2022-01-20 00:55:15 +00:00
Joshua Mccloskey
6a6fb6b78b
Merge "Added lottie animations for udfps side/tip" into sc-v2-dev
2022-01-20 00:33:05 +00:00
Joshua Mccloskey
21a4342048
Added lottie animations for udfps side/tip
...
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
Merged-In: Ic63a0eca226309b92aa64cb4f80791ef179b8154
2022-01-19 20:47:42 +00:00
Bonian Chen
e936ffecf4
[Settings] SIM colors are referenced by getIntArray() within source code
...
SIM colors are referenced by getIntArray() within source code
Bug: 211956916
Test: build pass
Change-Id: Idefac365e750e454a2c3c98b2b4f17acbe143820
2022-01-14 05:56:35 +00:00
Bill Yi
0179fc901f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe78ecd75a57eabe935572964ce4f941dcbe18d7
2022-01-14 03:46:33 +00:00
Treehugger Robot
48c90fde8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:54 +00:00
Bill Yi
0b57480c1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
2022-01-10 17:06:49 +00:00
Bill Yi
87d6f1f523
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52253a63ba60867e86c9f85474062a03155bf0aa
2022-01-10 17:03:04 +00:00
TreeHugger Robot
9dd4542560
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-09 05:13:52 +00:00
Bill Yi
fbe6fd97b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
2022-01-07 10:32:46 +00:00
Bill Yi
64a765a14c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
2022-01-07 10:17:54 +00:00
Bill Yi
39df254c94
Merge sc-qpr1 to aosp-master - DO NOT MERGE
...
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
2022-01-06 18:39:02 -08:00
TreeHugger Robot
c22a52aac3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:58 +00:00
TreeHugger Robot
71ae518c88
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:57 +00:00
Bill Yi
ae3198be93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I990751fa47191c170d7def2a005f94e688f2e7c5
2021-12-22 17:47:24 +00:00
Bill Yi
296eed7cba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib857a627605813328a0417897a4043923463e2ba
2021-12-22 17:32:06 +00:00
Stanley Wang
0bac54a0ee
Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667
Change-Id: I1eb6e46632e7486bfe79cada099059e333c3906b
2021-12-22 08:59:39 +00:00
Stanley Wang
446f6dd886
Restore the style of the screen saver widget from switch style to
...
button style.
The operation of the Switch is not suitable for previewing the
screen saver and will make the user confused. So we change the
style of the screen saver widget back to the button style.
Fix: 189505023
Test: manually test the screen saver
Change-Id: I4a97d91cc0b76111d4cb7b6aa202f2207ee0ca5d
2021-12-22 10:13:27 +08:00
Xin Li
971abb190b
Merge SP1A.211205.008
...
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08: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
Bill Yi
d2d3da3850
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
(cherry picked from commit ffc0ed7b89 )
Merged-In:I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-12-15 00:03:06 +00:00
Yanting Yang
a36d55e8f8
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620 )
(cherry picked from commit 5549bf8cd0 )
Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
2021-12-15 00:02:58 +00: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
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
Bonian Chen
078f873ccc
Merge "[Settings] Refactor Wifi Calling description text"
2021-12-14 02:09:36 +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
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
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
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
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