PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,720 Commits 1 Branch 0 Tags
da97af847cdec2f3fcfdb167f397242f68d5e9bf
Commit Graph

98720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
da97af847c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours am: 4844909fbe -s ours am: 0845cbd1b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib036a754f313ccaf5e6a90f50a528a9a27d7061d
 2021-12-01 18:12:21 +00:00
Bill Yi
b0dd3bf135 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours am: 887f2b7e02 -s ours am: 7b332c2f5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa3b334d27b7ab51d28b5eeb569a6d65058c0e34
 2021-12-01 18:10:01 +00:00
Joshua Mccloskey
3d5c9011f0 Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79 am: e372b2a22b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I32ecd37e6f3937a845ee2637b9774455a8bac81b
 2021-12-01 18:08:55 +00:00
TreeHugger Robot
bb125913f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908 -s ours am: 3042f4621d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ccd5b2d6e59c0883a7f03d30a0996f4f6054490
 2021-12-01 18:07:40 +00:00
Bill Yi
0845cbd1b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours am: 4844909fbe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75518960030ce5b91a026b0b7adc08f1ca375a82
 2021-12-01 17:22:30 +00:00
Bill Yi
7b332c2f5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours am: 887f2b7e02 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I285f04d126e007e4f17045d0a16092c022ffdc9b
 2021-12-01 17:21:17 +00:00
Bill Yi
4844909fbe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31222683be6f79243f3ba10c325192ad7528d21d
 2021-12-01 17:19:19 +00:00
Joshua Mccloskey
e372b2a22b Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
 2021-12-01 17:19:04 +00:00
TreeHugger Robot
41c84894fd Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod am: 68745620f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908

Change-Id: I47e3d183bd36426f160c3729b28595ec3bc55872
 2021-12-01 17:18:57 +00:00
Bill Yi
887f2b7e02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I176834d8b4dd5c41bb9514a5d998699d202652a3
 2021-12-01 17:18:27 +00:00
Bill Yi
7946a90b42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bda0cb874bb45735cda3852876ace5d8eef1635
 2021-12-01 17:18:20 +00:00
Bill Yi
44b1a40c39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a725a5b0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I979f14ee18342691f593b3d90cdfe8aa2b991511
 2021-12-01 17:17:55 +00:00
TreeHugger Robot
3042f4621d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I777b93480c0cde0d38aaf9e9d17a4c0992a702dd
 2021-12-01 17:17:48 +00:00
Joshua Mccloskey
1ca42ffc79 Merge "Disable setting if sensor is convenience." into sc-v2-dev 2021-12-01 17:09:50 +00:00
TreeHugger Robot
83fede5908 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-01 16:59:42 +00:00
TreeHugger Robot
68745620f7 Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 16:59:26 +00:00
TreeHugger Robot
639fc50211 Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891 2p: 8ab551fd7b
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 16:59:26 +00:00
TreeHugger Robot
a7fc80478d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-12-01 16:55:04 +00:00
Tsung-Mao Fang
737288ff75 Update background color for two-pane mode am: 395ea90b83 am: e6a79f0670 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: Ifad1cd990154bc3e367921e94ea5c9d1d7b73ca5
 2021-12-01 10:32:46 +00:00
Tsung-Mao Fang
e6a79f0670 Update background color for two-pane mode am: 395ea90b83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: I2b4fffda97aaec53945c4de4cf6248fb81163e64
 2021-12-01 10:22:01 +00:00
Tsung-Mao Fang
395ea90b83 Update background color for two-pane mode 
Update background color for status bar and
homepage background programically.
Also, we update the backgroud color for highlight items.

Test: Rebuilt apk and see the screen.
Bug: 195293058
Change-Id: Id100f8c9c7fc02c43420afcca07a703a14ec2312
 2021-12-01 16:39:09 +08:00
Pavel Grafov
e8d755061d Merge "Check user validity before retrying authentication" 2021-11-30 14:48:00 +00:00
Pavel Grafov
3a48226af1 Merge "Launch ForgotPasswordActivity in a new task." 2021-11-30 14:47:22 +00:00
Zoey Chen
3581f65d85 Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439 am: 4aef8765dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: Ic4648dad4fd7950510fea2382fa990efe900baf8
 2021-11-30 09:05:10 +00:00
Zoey Chen
4aef8765dc Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2
 2021-11-30 08:46:59 +00:00
Zoey Chen
1df187a439 Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev 2021-11-30 08:33:50 +00:00
Zoey Chen
8b1ecea060 [Settings] Should show carrier network if airplane mode is on 
https://hsv.googleplex.com/6007361661566976

Test: atest SubscriptionsPreferenceControllerTest
Bug: 206990845
Change-Id: Id39b662f33b201a8e4ce53c34c3007eca9a40edf
 2021-11-30 12:10:28 +08:00
Joe Bolinger
54b4689e5a Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b am: 77556bcc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I9c84fbac19a764c012168110db04832a4bf58e92
 2021-11-29 23:46:30 +00:00
Joe Bolinger
77556bcc51 Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I08041af311deb454a3f05b9328955b6489a8f35a
 2021-11-29 23:26:27 +00:00
Joe Bolinger
076dc5ee1b Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev 2021-11-29 23:15:15 +00:00
Adam Bookatz
cd429e74db Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled" 2021-11-29 21:00:48 +00:00
Etienne Ruffieux
6a709815df Merge "Refactor Bluetooth scan mode APIs" 2021-11-29 20:27:45 +00:00
Bill Yi
12a5d03d9f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0a4b094fdd4f7898eb3726ba17b23a3563acb2a
 2021-11-29 08:56:17 +00:00
Bill Yi
1b3c701077 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic270445cc1d57212de38787fab18a2d7ce937cca
 2021-11-29 08:52:04 +00:00
Bill Yi
51d79ee306 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891 2p: 8ab551fd7b 
Blank merge reason: parent was merged -s ours

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

Change-Id: I09df0851051109032b5c680c17662624d2343f59
 2021-11-29 08:48:45 +00:00
Bill Yi
8ab551fd7b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9cee529fb54682d0da69c6c39e1748cb8860d4a9
 2021-11-29 08:48:32 +00:00
Bill Yi
8e754d6891 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
 2021-11-29 08:48:23 +00:00
Bill Yi
c6e402faa7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45e746ac351c77ae6c6134c19dd7c778b382e945
 2021-11-29 08:44:20 +00:00
Bill Yi
5a725a5b0b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4bce9132bb3c7cb7736faa4e659bbaf217a90596
 2021-11-29 08:33:28 +00:00
Bonian Chen
75a5bdaa29 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 am: 12287b2c67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62
 2021-11-29 06:45:21 +00:00
Bonian Chen
12287b2c67 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
 2021-11-29 06:23:02 +00:00
TreeHugger Robot
fb0ca145aa Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd am: c6bc7a7c4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625
 2021-11-29 06:15:11 +00:00
Bonian Chen
1026e410f4 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev 2021-11-29 06:05:40 +00:00
TreeHugger Robot
c6bc7a7c4b Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
 2021-11-29 05:59:08 +00:00
TreeHugger Robot
cd8a01d2fd Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev 2021-11-29 05:37:34 +00:00
Charles Chen
a1c4d9b702 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 am: 181853efb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d
 2021-11-29 05:20:52 +00:00
Charles Chen
181853efb0 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
 2021-11-29 05:02:31 +00:00
Treehugger Robot
689086b230 Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e am: 96d33dbdbe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
 2021-11-29 04:56:43 +00:00
Treehugger Robot
96d33dbdbe Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
 2021-11-29 04:44:02 +00:00
Treehugger Robot
7e7b1f720e Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
 2021-11-29 04:27:25 +00:00