PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,057 Commits 1 Branch 0 Tags
4b47ce765971a7a9ad3f1be8d8dc9bc8a05c6a80
Commit Graph

82057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
4b47ce7659 Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598

Change-Id: I18737caa0626ad2eac6fd93e6c6d564020066724
 2021-04-27 16:46:22 +00:00
Automerger Merge Worker
0fdaafa672 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev am: 7fe923eec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7bf0363183ac3f996135a11172eaad96769b697
 2021-04-27 16:46:18 +00:00
TreeHugger Robot
830877c040 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours am: 0509118fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3653311dd4cf7750a7470651eea9faa7661e0145
 2021-04-27 16:46:14 +00:00
Automerger Merge Worker
dfa490490d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev am: 8b3e1ed7ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86f2744353895339122d9aa40f0b07ae6c2ad5f5
 2021-04-27 16:45:20 +00:00
TreeHugger Robot
4f2fcc4984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours am: 9761ce3e93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib78dd9a3105a466424d0086d33d1d24c7c6444d6
 2021-04-27 16:45:13 +00:00
Adam Bookatz
e035a81ddc Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev 2021-04-27 16:35:37 +00:00
TreeHugger Robot
6ba6bae697 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-27 16:25:21 +00:00
TreeHugger Robot
0056ac6bf7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-27 16:24:37 +00:00
Automerger Merge Worker
7fe923eec3 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev 2021-04-27 16:21:56 +00:00
TreeHugger Robot
0171541f46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77e8734d4049649fe19c74f0eef0015ef8fbbab1
 2021-04-27 16:21:54 +00:00
TreeHugger Robot
0509118fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I513fde8dfce142f3119e08e272ab1f83f10e9b09
 2021-04-27 16:21:52 +00:00
Automerger Merge Worker
8b3e1ed7ac Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev 2021-04-27 16:21:48 +00:00
TreeHugger Robot
413a305c27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4187dd45690d6a2889496db8c83dcc5174ce03f
 2021-04-27 16:21:42 +00:00
TreeHugger Robot
9761ce3e93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45e1115533ba4fec0cef8dc3fd42c873e05b631d
 2021-04-27 16:21:39 +00:00
TreeHugger Robot
e8413529ce Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 16:16:39 +00:00
TreeHugger Robot
81aaadca0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ae76a9806d39de81adc2d7e127651f7f39dd735
 2021-04-27 16:04:18 +00:00
TreeHugger Robot
8d58c02b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c87402a98bc9642b5b555c66aee6f423b84e9ff
 2021-04-27 16:04:08 +00:00
TreeHugger Robot
cce8a5862e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f69ba03181 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7326930b379f809c09450c8d8943701af2fe5040
 2021-04-27 15:56:26 +00:00
TreeHugger Robot
a03e096bb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a2a94ad379 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8353f8b578c72c197b5c919a6b9601612901b7b
 2021-04-27 15:56:20 +00:00
TreeHugger Robot
c430db5ca3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 15:55:21 +00:00
TreeHugger Robot
697411518c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 15:50:33 +00:00
TreeHugger Robot
4fd6557446 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 15:48:51 +00:00
TreeHugger Robot
f69ba03181 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-27 15:47:01 +00:00
TreeHugger Robot
a2a94ad379 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-27 15:42:58 +00:00
Tsung-Mao Fang
801b6fc194 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours am: 744dd99af4 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I740aeca7ee8f647929469c529e6a934d60685fff
 2021-04-27 13:34:21 +00:00
Tsung-Mao Fang
744dd99af4 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: Ia128429dadf68a8276eff806ee0e0eabad088913
 2021-04-27 13:28:36 +00:00
Tsung-Mao Fang
56f011088c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours am: 78de74aa57 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f is already in history

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

Change-Id: I794e659939bfa11430ab973481f1f6a2bacfc1c5
 2021-04-27 13:26:50 +00:00
Tsung-Mao Fang
78de74aa57 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f is already in history

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

Change-Id: I1bf9360219cdc326571ffc9604a42792dcc31aba
 2021-04-27 13:12:34 +00:00
Tsung-Mao Fang
59463e3e04 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: If58e759bcef83da086ded4366ac60647653d62cc
 2021-04-27 13:11:26 +00:00
Tsung-Mao Fang
92d5e58003 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: If97943cb25cbbe5388a9b5d28faa50b4df156aad
 2021-04-27 12:55:29 +00:00
Tsung-Mao Fang
9d5a7aa322 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I64550f7d57fd8c4cd2a142188ed78e9bb49f1c9f
 2021-04-27 12:54:02 +00:00
Tsung-Mao Fang
f470b78ff2 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I4dd08163fb97a16c88aa23bdc39851b327034940
 2021-04-27 12:30:50 +00:00
Tsung-Mao Fang
6ac45a7ceb Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I80b527b2bb891b3944a11ceecf296fdefaefff72
 2021-04-27 12:15:53 +00:00
Bill Yi
0dfde85685 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie67bcfcb0c86013aae724ff562709f8c11a8796b
 2021-04-27 11:48:42 +00:00
Bill Yi
af6cb9521a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0002b7e1f99b67a31204e15c90ba5dbc1d4c37c2
 2021-04-27 11:44:41 +00:00
Bill Yi
73e1e602f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia451dd13495fb8921ec6c86e1351802e94d078d4
 2021-04-27 11:41:02 +00:00
Bill Yi
bfdd5160c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0ed785c170a86f67ab29d9c90dd6829c8311e41
 2021-04-27 11:39:24 +00:00
Bill Yi
1296c998dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifb1673ddffb724df5b7a587e9dd9a761b9820b3b
 2021-04-27 11:36:37 +00:00
Bill Yi
abedd5d55a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8a23676662f760eca22337c8cee2b1df7b348ccc
 2021-04-27 11:33:06 +00:00
Bill Yi
4012b44f4f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I829f3d222f9d37b06d9d6f3408f0f67297162a76
 2021-04-27 11:30:15 +00:00
Bill Yi
02a535e27d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f604c21a5a6dc46c093cab5eadd178e5b931837
 2021-04-27 11:26:41 +00:00
YUKAI HUNG
f81503e7bc Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865

Change-Id: I894265d5ef62befca05fbff6b9f51754288f2fa0
 2021-04-27 09:43:19 +00:00
Jeremy Goldman
a9b19776f8 Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: I979e3a78742eeca8405e4cb5be1bc7f0fe8cad3c
 2021-04-27 09:43:09 +00:00
YUKAI HUNG
95b5d0393d Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev 2021-04-27 09:19:17 +00:00
Jeremy Goldman
f1ee6987e6 Merge "Combine 5G and recommended strings" into sc-dev 2021-04-27 07:41:45 +00:00
ykhung
2f441d2a3e Draw timestamp information into BatteryChartView manually (1/2) 
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: Ib4ac21ba2d12a6cb65b46ba3f1023fe9f14c539b
 2021-04-27 07:25:53 +00:00
Yanting Yang
a62dfa6e8c Merge "Update homepage icon for Wallpaper & style" into sc-dev am: 72ba46a9bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319863

Change-Id: I56a5524c31a708bdec6560a30508cf10756ec694
 2021-04-27 07:18:46 +00:00
Yanting Yang
72ba46a9bb Merge "Update homepage icon for Wallpaper & style" into sc-dev 2021-04-27 07:04:40 +00:00
Lucas Lin
00eb4bbf58 Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401

Change-Id: Ib5143bd894b26b93681f5330bbe681dbc903c492
 2021-04-27 06:15:06 +00:00
Lucas Lin
614f653aeb Merge "Use [set|get]PrivateDnsMode directly" into sc-dev 2021-04-27 06:03:14 +00:00