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
Wesley Wang
6ffcf8bfa9
Merge "Update app usage page active time format" into sc-dev
2021-04-22 08:52:39 +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
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
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
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
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
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
Arc Wang
3486b95fd7
Merge "Update progress bar UI" into sc-dev
2021-04-21 09:01:35 +00:00
Alex Johnston
7f56d09993
Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14011458
Change-Id: I5a2335e66ae74a608b20e41729a2790f7f2444cf
2021-04-21 08:54:50 +00:00
Alex Johnston
4a4e2bae61
Merge "RequestManageCredentials dark theme" into sc-dev
2021-04-21 08:45:06 +00:00
TreeHugger Robot
513c0a1d1c
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566
Change-Id: I18bc1abe24d6fb67772770bc473e796a9fed0c19
2021-04-21 08:41:33 +00:00
TreeHugger Robot
73a806fa37
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:04 +00:00
TreeHugger Robot
d4a4fead67
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev
2021-04-21 08:19:13 +00:00
Bill Yi
1d413d8390
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic67b0bfa2e86c32e2084d36459916aae031f97ed
2021-04-21 07:25:12 +00:00
Bill Yi
18bbddbc72
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
2021-04-21 07:17:44 +00:00
Menghan Li
5385c6bc66
Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev am: d3cc241c42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255410
Change-Id: Ic53f93e9a3493ce1ddc2bb5696fdd8a5fdeac140
2021-04-21 06:05:26 +00:00
Sunny Shao
c361e3426f
Fix background inconsistency of the Settings page in SUW
...
- Pass the extra arguments to target page from vision settings.
- Add the android:colorBackground to LightTheme.SubSettings.SetupWizard.
Fixes: 185873105
Bug: 184901818
Test: manual test
Change-Id: I063a8df875b727aa0e119b03dfb782c2b95dc1b5
2021-04-21 13:35:45 +08:00
menghanli
b4558c9607
[Material Next] Update main feature switch for Caption preferences.
...
Fix: 185950803
Test: manual test
Change-Id: I5431461f3088652ddff7400b24b3eea25ddf5f9a
2021-04-21 11:39:56 +08:00
TreeHugger Robot
a0501be2b0
Merge "Fix search index for a financed device" into sc-dev am: db3767e7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14163911
Change-Id: I217da001caa9f904a25d25e031ec06c5f5156e1c
2021-04-20 21:40:18 +00:00
TreeHugger Robot
db3767e7b3
Merge "Fix search index for a financed device" into sc-dev
2021-04-20 21:06:45 +00:00
TreeHugger Robot
33583e7990
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 20:04:02 +00:00
TreeHugger Robot
f988d7688b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 19:46:16 +00:00
Salud Lemus
9068481299
Fix search index for a financed device
...
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.
Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest
Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
2021-04-20 12:17:39 -07:00
Bill Yi
1d6b60889e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f73237f7a7fcef3389c3afebadcafdb0be4d60c
2021-04-20 18:42:47 +00:00
Bill Yi
bf0d0fe30e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
2021-04-20 18:35:03 +00:00