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

82876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4f94e0cd85 Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930

Change-Id: I38a98314ba25f7dc1290896266526279f2e1eb24
 2021-05-19 03:41:38 +00:00
TreeHugger Robot
a8ae7dbbac Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361

Change-Id: Ia226efbfe9dcddb8b9f42dda6e21d18d46440707
 2021-05-19 03:41:33 +00:00
TreeHugger Robot
2a5eb6154f Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357

Change-Id: I8abf6face0d5d5e007143fd7e3e7313b0f1448dd
 2021-05-19 03:41:14 +00:00
TreeHugger Robot
a07eb69948 Merge "Fix the text contrast for biometric header" into sc-dev 2021-05-19 03:17:48 +00:00
TreeHugger Robot
6d550713dd Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev 2021-05-19 03:16:47 +00:00
TreeHugger Robot
4a67b1c099 Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev 2021-05-19 03:15:28 +00:00
TreeHugger Robot
b37d6f941a Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073

Change-Id: I70e8b37e9112d7e6dec18c6b0f9629127a79a994
 2021-05-19 00:08:16 +00:00
TreeHugger Robot
4335268c81 Merge "Controls/Pay - Use new privacy setting" into sc-dev 2021-05-18 23:55:18 +00:00
Chloris Kuo
9b0638513a Merge "Fix NAS dialog string" into sc-dev am: 074eee332a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898

Change-Id: I05224114e103c2ac166a41bc4a353a214328908d
 2021-05-18 18:21:21 +00:00
Chloris Kuo
074eee332a Merge "Fix NAS dialog string" into sc-dev 2021-05-18 17:54:50 +00:00
YUKAI HUNG
f388489071 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994

Change-Id: I4e449dcc6ad8a909cdd285ee134b6a6935fa3bb6
 2021-05-18 15:49:02 +00:00
TreeHugger Robot
e64a9d0a52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours am: 1aed128b64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib61d61cf6dfa6a01ec6d873dd8c14dc19c21a035
 2021-05-18 15:48:41 +00:00
YUKAI HUNG
80f2f43d59 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev 2021-05-18 15:41:16 +00:00
TreeHugger Robot
1aed128b64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I693505d6b5e10e7b061d42073280dec33dafbdea
 2021-05-18 15:29:22 +00:00
Bill Yi
68bfc095b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours am: 0ee82f4c33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic90a99505a7e0c4f8ef8ff98fa14c8616c0569f3
 2021-05-18 15:17:39 +00:00
TreeHugger Robot
7aae50fb8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours am: 6ac3c7186a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5088b47de63341279eaaff150b23d17f8d1b9187
 2021-05-18 15:17:36 +00:00
Bill Yi
47de4b553e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours am: 712b1d5b4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icccc7a683a1c7b379580fa499e0cdca1c4e8047b
 2021-05-18 15:17:21 +00:00
TreeHugger Robot
7659a826c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-18 15:09:42 +00:00
Bill Yi
0ee82f4c33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id52006206bc4bb7c559e8f32217d6e37fe29c657
 2021-05-18 14:57:02 +00:00
TreeHugger Robot
6ac3c7186a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02beb2105366dc036644655914ca838efd839172
 2021-05-18 14:56:28 +00:00
Bill Yi
712b1d5b4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab9767edf8ee20f7b69ad87e786d04177895c7e4
 2021-05-18 14:56:20 +00:00
TreeHugger Robot
47a01b4622 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0af7445e78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3968539b2c0e5dc0fdafdf11e7b6d8973b9bb096
 2021-05-18 14:46:47 +00:00
TreeHugger Robot
278c488896 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 583c25da1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c218e663320c46eb180b6c797260e957183c890
 2021-05-18 14:46:32 +00:00
TreeHugger Robot
6ab5e4327c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-18 14:43:32 +00:00
TreeHugger Robot
0af7445e78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:36:27 +00:00
TreeHugger Robot
583c25da1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:32:55 +00:00
ykhung
1ea5208fa8 Align system time 12-24 hour format in the time slot information 
align the time format configuration in the Settings -> System ->
Date/Time to show 12- or 24- hour format in the usage time slot

screenshot: https://screenshot.googleplex.com/3w2SFvBLpC5oHBs
screenshot: https://screenshot.googleplex.com/86uCq6R4PKEg9RD
screenshot: https://screenshot.googleplex.com/3easrEFMQdZEjGP
screenshot: https://screenshot.googleplex.com/7dPWVJNTbSShFPa

Bug: 187783891
Test: make SettingsRoboTests
Change-Id: I9af0a69bd7c67562526bd5ee74a657635068ef44
 2021-05-18 13:46:43 +00:00
Matt Pietal
edd1918866 Controls/Pay - Use new privacy setting 
Refer to the now centralized Secure setting, instead of local strings

Bug: 188175341
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I5fff84347c369ae94d6c8359cc49dcbcf9b6ee72
 2021-05-18 07:55:21 -04:00
TreeHugger Robot
70c0d7c002 Merge "Update style name" into sc-dev am: db6c7211e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547063

Change-Id: Ibe462c631de99c5adc8b1aa50d4c7665bf79caf5
 2021-05-18 11:37:48 +00:00
TreeHugger Robot
db6c7211e4 Merge "Update style name" into sc-dev 2021-05-18 11:28:56 +00:00
Arc Wang
512c5ada1c Merge "Add "This device" string for default internal storage" into sc-dev am: 7c3adee295 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609995

Change-Id: Icb0c4480b0b5a6bd35857d1693ab4ace007f0986
 2021-05-18 09:36:25 +00:00
Arc Wang
7c3adee295 Merge "Add "This device" string for default internal storage" into sc-dev 2021-05-18 09:18:54 +00:00
Arc Wang
1aac3eb017 Add "This device" string for default internal storage 
Bug: 188492974
Test: build pass
Change-Id: I075441f1211b10eeb69f5a85818261d6083a5453
 2021-05-18 16:09:43 +08:00
Bill Yi
64b93de7fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68e6533cfd3227be4253cd2839924d5605277299
 2021-05-18 07:59:02 +00:00
Bill Yi
e1ced04862 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib2fcc8cb7140ff10b4be202b67c7cac152791c5e
 2021-05-18 07:50:11 +00:00
Bill Yi
863787066f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I709fca4e70ea54241c6bb553dbfa327a469021fe
 2021-05-18 07:45:52 +00:00
Bill Yi
8cecd68c0c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib190cfbca4b19a2c8281647d630837128ba64c8a
 2021-05-18 07:42:30 +00:00
Bill Yi
9afa4248cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad8f93395efff8ba022148339bd3f5315c34cdfa
 2021-05-18 07:39:35 +00:00
Bill Yi
f44fef2834 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d2a14d7fe038edf738a1fec382328f8a8564f67
 2021-05-18 07:36:05 +00:00
Betty Chang
6a065b1f41 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev am: 78031d82b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609992

Change-Id: Ie7abb9868d8f85fa6c8714dd24fab135172873a5
 2021-05-18 07:02:57 +00:00
Betty Chang
c88ac6fc78 Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev am: 2d3487f704 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609990

Change-Id: I2ca62d0f7fef6e90872ccaa83b2ae1ac7b11192c
 2021-05-18 07:02:44 +00:00
Betty Chang
78031d82b7 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev 2021-05-18 06:47:00 +00:00
Betty Chang
2d3487f704 Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev 2021-05-18 06:41:03 +00:00
ykhung
4d8f4e92d1 Add metric for battery defender am: 6590b368f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I76e5c84510d36acc84a9f8d1e1dbf2b95c49cf9d
 2021-05-18 05:41:06 +00:00
ykhung
6590b368f2 Add metric for battery defender 
Bug: 188384887
Test: make SettingsRoboTests
Change-Id: Ida96deb6efe94a98cf6837b9f82758467a4d1300
 2021-05-18 05:19:45 +00:00
Menghan Li
bbe0e006ad Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: I15afebdfd39fd2f4b31bb856822e4dcd8d66ce7b
 2021-05-18 05:01:10 +00:00
Menghan Li
cadd868911 Merge "Fix flake issue on SettingsRoboTests" into sc-dev 2021-05-18 04:36:32 +00:00
TreeHugger Robot
8a70ea3cb1 Merge "Fix search highlight issues" into sc-dev am: 03099c04bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: Ib2f47a1050eb9296351f216d431ef7bd626a21e9
 2021-05-18 03:57:38 +00:00
Mill Chen
39c512f9aa Fix the text contrast for biometric header 
Since the color of text was using material dark color from material
theme, which is different from the one in Settings. Removing the text
color specified in the style can fix this problem.

Fix: 182437787
Fix: 187145158
Test: visual verified
Change-Id: I4ad5004a6811713982d0d22a8050889d75cc3a5f
 2021-05-18 11:46:15 +08:00
TreeHugger Robot
03099c04bd Merge "Fix search highlight issues" into sc-dev 2021-05-18 03:24:17 +00:00