Betty Chang
a76c6efc0e
Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092
Change-Id: I51b2c94a72c518104d40a5106398d99bdc38ef17
2021-05-24 06:54:20 +00:00
Alex Li
f54063e13b
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091
Change-Id: I62ae4000f3e385356a9074ec245aabd6911a8787
2021-05-24 06:54:15 +00:00
Betty Chang
4246049c7c
Merge "Remove the Network rating provider item" into sc-dev
2021-05-24 06:42:10 +00:00
Alex Li
d647dece76
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev
2021-05-24 06:32:09 +00:00
TreeHugger Robot
e2cd6ad76b
Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950
Change-Id: Ic062e5e46357d49c0758468c954c30829cb0aee9
2021-05-24 06:22:37 +00:00
Edgar Wang
41b13a34b4
Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956
Change-Id: Idfbd77b165d0b43d230c6b37da5c1c8ae05659d5
2021-05-24 06:22:30 +00:00
TreeHugger Robot
2d31d85b5b
Merge "Remove redundant learn more link" into sc-dev
2021-05-24 06:12:52 +00:00
Edgar Wang
54aacf80fe
Merge "Align the items in account sync page to the start border" into sc-dev
2021-05-24 06:08:30 +00:00
Ryan Lin
f8688671f7
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928
Change-Id: Ie1ea496961f4cab91779fd92558b7d1b5d4db4a5
2021-05-24 03:45:26 +00:00
TreeHugger Robot
e250b21c41
Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951
Change-Id: I8de13c57801126caf208d8acc102a81dce4ffe2a
2021-05-24 03:45:20 +00:00
Ryan Lin
31389702ad
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev
2021-05-24 03:41:39 +00:00
TreeHugger Robot
9081a2e67d
Merge "Update Policy transparency dialog to new style" into sc-dev
2021-05-24 03:28:04 +00:00
TreeHugger Robot
4d1e51f872
Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952
Change-Id: I93472fb8aaa4331f0d691ef761fb3e065ad22483
2021-05-24 02:30:22 +00:00
TreeHugger Robot
24f2dda922
Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev
2021-05-24 02:15:08 +00:00
Jason Chiu
4b1d1e21d5
Align the items in account sync page to the start border
...
The prefernces haven't been applied to the SettingsLib preference theme
which sets iconSpaceReserved false.
Fixes: 187670431
Test: visual, robotest
Change-Id: Ifa797fbec4f207248fd0254e26d456b8889e25d8
2021-05-24 10:13:53 +08:00
Bill Yi
035f7580d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40
-s ours am: 56713ae05c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: Ib33d3f60fa799a4b3d74e7cfe3431b15f45862be
2021-05-23 05:21:49 +00:00
Bill Yi
bc6c7adb9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d
-s ours am: 56e7fa34f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: Ida96f79f3f74f5b660c5d13337663916bb706109
2021-05-23 05:21:45 +00:00
Bill Yi
56713ae05c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: Id9515df78a4b114d6fbcdda30732fc5141187207
2021-05-23 05:20:35 +00:00
Bill Yi
56e7fa34f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: If57ebc6b440b41974f4303730be27814a10aabd0
2021-05-23 05:03:57 +00:00
Tim Peng
4d41945d77
[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest
...
-design changes and no battery icon
Bug: 188727945
bug: 188498118
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Ic5ebb3b5c06180090d54cd436c88c0bebe0d79f5
2021-05-22 13:39:25 +00:00
Bill Yi
fb9fbf219d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib996a2402a98bdfa5f1e0ba8550f89bc7a4ea2f9
2021-05-22 12:37:46 +00:00
Bill Yi
cbfc8c9e40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib0434b33264bc49e44dd206093ebfbb32e3484cc
2021-05-22 12:32:06 +00:00
Curtis Belmonte
35e4397090
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: I1b7b0bfae78f13d1feba7692002c6bfa0676a8e5
2021-05-21 23:58:32 +00:00
TreeHugger Robot
fb4a0b5f55
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: I4e80807e8989b21fde931205e51c7da977d85647
2021-05-21 23:57:03 +00:00
Chen Xu
9cfc1d747e
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: I50d27fa8a90cba1ba2fbea021338a8ba50d08e0e
2021-05-21 23:55:18 +00:00
Curtis Belmonte
0327293c3c
Merge "Update Face Unlock strings to the latest versions" into sc-dev
2021-05-21 23:40:40 +00:00
TreeHugger Robot
c8b025cc7f
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev
2021-05-21 23:34:55 +00:00
Chen Xu
ed23483ca7
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev
2021-05-21 21:21:19 +00:00
Joe Bolinger
eb5fd6ec30
Prevent duplicate lock confirmation in face & fingerprint settings.
...
Wait for all extras to be available before launching the next activity.
Fix: 187005993
Test: manual (open face/fp settings & verify only asked for PIN once)
Change-Id: I9e3f46d5750b11ab0773d08d44908d3e9703ca42
2021-05-21 20:55:11 +00:00
Curtis Belmonte
47d74ccfd7
Update Face Unlock strings to the latest versions
...
Makes the following changes to strings related to Face Unlock:
- Standardize capitalization of "Face Unlock"
- Use latest versions of traffic light face enroll strings
- Use latest versions of combined biometrics settings strings
- Set SUW description strings programmatically instead of in XML
Test: Manually tested Face Unlock traffic light and grid UIs
Bug: 183649070
Change-Id: Ie67978ae2630493a5b03b00c3f8a639066ab8f3a
2021-05-21 13:11:52 -07:00
Edgar Wang
de88f5244c
Update Policy transparency dialog to new style
...
- Tweak layout
- Update app icon
- Update font Size
Bug: 188756125
Test: manual
Change-Id: I7ddd73c80ead95d57202d1753408b437611a76b4
2021-05-22 04:00:38 +08:00
TreeHugger Robot
f79fc1f455
Merge "Should not show top intro in search" into sc-dev am: c102420acb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: If189fb98a17d9776e9d180631d1440eba753caea
2021-05-21 18:26:51 +00:00
TreeHugger Robot
c102420acb
Merge "Should not show top intro in search" into sc-dev
2021-05-21 18:02:21 +00:00
Mill Chen
8dfa74f6b8
Remove redundant learn more link
...
Fix: 188579822
Test: visual verified
Change-Id: If542976f8d04db5e3bab13da248c555caf75638f
2021-05-22 01:46:39 +08:00
Quang Luong
4921f2fd3c
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: I76d5a1615b3158dc11c84be61360f8609033f45d
2021-05-21 17:19:05 +00:00
Quang Luong
ae59885f3d
Merge "Refresh security pref in Network Details page" into sc-dev
2021-05-21 17:14:35 +00:00
TreeHugger Robot
f23959cf91
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: I0252c41e823d569d2cfbabd550cb87a07bf0c126
2021-05-21 17:11:25 +00:00
TreeHugger Robot
48fab1db3a
Merge "Fix the color of dot wrongly in device admin page" into sc-dev
2021-05-21 17:05:30 +00:00
Yi Jiang
f1ceff4995
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: I65f6f9aa7117c9b6e9e15c81300605d2af9cc58a
2021-05-21 17:03:38 +00:00
Yi Jiang
f1d1765e38
Merge "Defers initialization of preferences." into sc-dev
2021-05-21 16:41:10 +00:00
YUKAI HUNG
6b9883b8a3
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: Ia28b783c3411cf9e7c8595b67a4dc665d81a2d4d
2021-05-21 13:27:57 +00:00
YUKAI HUNG
8033a6ff20
Merge "Fix footer preference may flash one time when entering" into sc-dev
2021-05-21 13:04:11 +00:00
Yanting Yang
dca2e6903c
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I0475178927954303bfb15638d91b4db54060106a
2021-05-21 12:44:00 +00:00
Yanting Yang
5b6cb52c50
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev
2021-05-21 12:26:41 +00:00
TreeHugger Robot
afe0ff787d
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: Ia5e72969e61f8af560a2617579386bd031891bbe
2021-05-21 10:00:14 +00:00
ykhung
e030d8613a
Fix footer preference may flash one time when entering
...
new solution > We will not show the footer preference in the beginning when users entering the app, it will wait until the data is loaded to show the footer and app item in the same time. We also enhance the footer message as "Battery usage data will be available after you use your phone for a few hours" when there are not content in the begining.
Bug: 187766862
Bug: 188871770
Test: make SettingsRoboTests
Change-Id: I8d19173b4402722797b1ae3c4cfe6dcdf2d3fe3f
2021-05-21 09:50:43 +00:00
TreeHugger Robot
417af889e1
Merge "Fix overlapping problem for device admin page" into sc-dev
2021-05-21 09:42:05 +00:00
changbetty
8267a2757f
Remove the Network rating provider item
...
Bug: 187119482
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Iff4a7663c0bca8f0553fcd16673a9aa766050ff4
2021-05-21 17:08:44 +08:00
TreeHugger Robot
ee1f633cf0
Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997
Change-Id: I891135a8ef9ec07ff0c7ddbc8363836ad78e6198
2021-05-21 08:37:20 +00:00
ryanlwlin
964872ab96
Fix incorrect seperator while concatenating shortcuts
...
We concatenate the selected shortcut with a comma
that is not localized. To fix it we use listformatter
to concatenate them.
Bug: 186891004
Test: manually test with differnt languages.
Change-Id: I2c6692facd457b434c56a0633e784ce771905b29
2021-05-21 16:32:23 +08:00