PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,025 Commits 1 Branch 0 Tags
c99ce53e7e74deec63f319dba0bed711e6a2fa70
Commit Graph

81025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wesley Wang
c99ce53e7e Merge "Update app usage page active time format" into sc-dev am: 6ffcf8bfa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14264141

Change-Id: Ie864ccf254b877bff4a8ed1e060890133a1e474d
 2021-04-22 09:14:19 +00:00
YUKAI HUNG
87714e3201 Merge "Implement expandable item for system component usage data" into sc-dev am: 7144b6fe5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266965

Change-Id: I9cf1d0aaab7d7e560888615536f01b2768840486
 2021-04-22 09:13:56 +00:00
Wesley Wang
6ffcf8bfa9 Merge "Update app usage page active time format" into sc-dev 2021-04-22 08:52:39 +00:00
YUKAI HUNG
7144b6fe5d Merge "Implement expandable item for system component usage data" into sc-dev 2021-04-22 08:42:45 +00:00
Joy Babafemi
bdf6d289be Merge "Add UWB Settings" into sc-dev am: a1fe5ec083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14240457

Change-Id: Ic5fa6c615539833b38a6c91b27efe4d2c7fbe0b3
 2021-04-22 07:58:10 +00:00
Jeremy Goldman
a822085b71 Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev am: ef7fd39f91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233634

Change-Id: I511456251c08b75dab6c77d5f4004d512280bb37
 2021-04-22 07:57:38 +00:00
Joy Babafemi
a1fe5ec083 Merge "Add UWB Settings" into sc-dev 2021-04-22 07:39:12 +00:00
Jeremy Goldman
ef7fd39f91 Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev 2021-04-22 07:26:10 +00:00
ykhung
e1cec0e08d Implement expandable item for system component usage data 
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id488ab23039ff12480da5e02b6a96ff70e879007
 2021-04-22 06:50:39 +00:00
TreeHugger Robot
5abd10ed60 Merge "Update the style for collapsing toolbar" into sc-dev am: ea2a359561 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199749

Change-Id: I289a734eb4ab88dd017c8d3c169cd0a150dcd69f
 2021-04-22 06:47:14 +00:00
TreeHugger Robot
ea2a359561 Merge "Update the style for collapsing toolbar" into sc-dev 2021-04-22 06:40:23 +00:00
Joy Babafemi
a5672945ae Add UWB Settings 
Screenshot 1: https://screenshot.googleplex.com/5wjKkioeehZnz74
Screenshot 2: https://screenshot.googleplex.com/AtaufsUgLgVk2Ur

Test: Robotest
Bug: 183254940
Change-Id: Ibd2e3f3ad9596dddbdd23d7f2ad5e03768648faf
 2021-04-22 06:16:35 +00:00
PETER LIANG
2919b6785c Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev am: f71aad11e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265788

Change-Id: Ia6a3091f8986afdf8b46c5facafaa0ff01a9a584
 2021-04-22 00:53:28 +00:00
PETER LIANG
f71aad11e3 Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev 2021-04-22 00:41:41 +00:00
Chloris Kuo
f52898401c Merge "NAS setting migration" into sc-dev am: 1a44af9585 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14259014

Change-Id: Ia0043098fa7a67e561ec8b085e4fbfcb3b1ef302
 2021-04-22 00:31:25 +00:00
Chloris Kuo
1a44af9585 Merge "NAS setting migration" into sc-dev 2021-04-22 00:23:25 +00:00
Curtis Belmonte
c17e2e75a5 Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: Ic20841bee00c0a6627d1c772c346409edf894ba1
 2021-04-21 21:57:59 +00:00
Curtis Belmonte
b662335341 Merge "Log new auth-related framework atoms for Android 12" into sc-dev 2021-04-21 21:34:22 +00:00
Neil Fuller
297ba96a01 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: Ief6368326813f6e444675ce0ff19ba35b3e0ff93
 2021-04-21 20:01:40 +00:00
Neil Fuller
33aa65b3cc Merge "Remove restriction for "Use location..."" into sc-dev 2021-04-21 19:54:41 +00:00
TreeHugger Robot
ffb9e456d3 Merge "Notif history styling updates" into sc-dev am: b768489fa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Ie0ee54c030626845189e05ca4e8268450edf83eb
 2021-04-21 17:19:25 +00:00
TreeHugger Robot
b768489fa0 Merge "Notif history styling updates" into sc-dev 2021-04-21 16:46:31 +00:00
Sally Yuen
8a495fd55c Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: I59b5bcb68a725ad69a48dbd8088db7f02d5f850e
 2021-04-21 16:25:30 +00:00
Julia Reynolds
b1dda2487f Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: I9bb8705b59e20e3fd49dda97ad345c72e3fcad5b
 2021-04-21 16:25:04 +00:00
Sally Yuen
790d69d465 Merge "Add extra dim keywords to aosp settings" into sc-dev 2021-04-21 16:13:46 +00:00
Julia Reynolds
5770b4e928 Merge "Use a new string for category headers" into sc-dev 2021-04-21 16:10:22 +00:00
Julia Reynolds
e8a33e0c83 Notif history styling updates 
Test: manual
Fixes: 185625272
Change-Id: Ie9d62573b2c6480b84ab9172beccf519e7e880dc
 2021-04-21 10:55:51 -04:00
Julia Reynolds
60ded30669 Use a new string for category headers 
The existing string refers to singular objects, but we need
to refer to several

Test: manual
Fixes: 185325146
Change-Id: Ie22fa7a8c1857558baceb05d8ca80cfd6ff61ed4
 2021-04-21 14:48:31 +00:00
YUKAI HUNG
038ea6c4cb Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: If2f78cfb89edee1613b3a5de51c311ff521b8bd2
 2021-04-21 14:47:03 +00:00
YUKAI HUNG
c6c3b383da Merge "Add new expandable preference component" into sc-dev 2021-04-21 14:20:26 +00:00
Peter_Liang
d2658b57d8 Fix the entire text is aligned middle of the Vision setting screen. 
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.

Solution:
Remove the overriden preferenceStyle.

Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
 2021-04-21 22:08:45 +08:00
TreeHugger Robot
fbc72482e3 Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I71ed1fcc3356172d93f4a585771a9ec7e8e4a220
 2021-04-21 13:35:08 +00:00
TreeHugger Robot
b4678cd9a0 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: If40e4d2476825477f949a919ca106b63af9da571
 2021-04-21 13:34:58 +00:00
TreeHugger Robot
e1b63f00a2 Merge "Notif history Long tap functions as short tap" into sc-dev 2021-04-21 13:10:25 +00:00
TreeHugger Robot
7f065adfcb Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev 2021-04-21 13:06:45 +00:00
Wesley.CW Wang
2cc7431fa3 Update app usage page active time format 
- Make the text of active time support different states like foreground or background usage time less than one minutes

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I20be88e5b23a679c15f97bac4b9d400557685463
 2021-04-21 20:20:05 +08:00
ykhung
b8721cf980 Add new expandable preference component 
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id2b2a1f4fa557467efcaa013aa9e978b2c66d974
 2021-04-21 11:58:45 +00:00
Matt Pietal
aa0062c92f Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: I8936eee6221fc6090e1cf1ee185c1cd0214f5d96
 2021-04-21 11:40:12 +00:00
Matt Pietal
ee2086872e Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Alex Johnston
8a3372b075 Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: Iea87a55ee8a521b706090543ff5d9c53258b62db
 2021-04-21 09:29:49 +00:00
Alex Johnston
2f9b5b6ad7 Merge "Fix maximum time to lock" into sc-dev 2021-04-21 09:17:28 +00:00
TreeHugger Robot
d473c68668 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours am: d070df12f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff773c0fa75dc46ab4da5e88d160a7f4db50ae27
 2021-04-21 09:06:45 +00:00
Automerger Merge Worker
5d7e59f6ca Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fa380ba650c00a78c51cda70147df04291d673f
 2021-04-21 09:06:41 +00:00
TreeHugger Robot
7d01bd4b93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -s ours am: 9817a5b35a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73b68c5bfdfdcee5de93405cc58c8b54db62862e
 2021-04-21 09:06:37 +00:00
Bill Yi
a873daf629 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a -s ours am: 710845107d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia717eade74fe3a54c05ad814207941569eaaeef7
 2021-04-21 09:06:33 +00:00
TreeHugger Robot
d070df12f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf607b2bda1edbdf68e1877abe71e89ecedb5372
 2021-04-21 09:06:18 +00:00
Arc Wang
6e3d7e7236 Merge "Update progress bar UI" into sc-dev am: 3486b95fd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149

Change-Id: Ibf6f427ebefb98bccc8bfc22e0c3cd580c2d9465
 2021-04-21 09:06:18 +00:00
Automerger Merge Worker
1119508d1c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev 2021-04-21 09:06:17 +00:00
Bill Yi
23b6d6634f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia67909919f88744680bc3263b1fba2667f060e5c
 2021-04-21 09:06:14 +00:00
TreeHugger Robot
9817a5b35a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd71ee35579a8814b519b3c7ed989e558ad273e6
 2021-04-21 09:06:11 +00:00