PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,036 Commits 1 Branch 0 Tags
4533b43747ffb3a34564b9d7594ef5a03e35cbe0
Commit Graph

83036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YUKAI HUNG
4533b43747 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I62af1efec49aef3d234d30b97e7df2fdeffa26a5
 2021-05-24 11:53:29 +00:00
YUKAI HUNG
648f773c7c Merge "Move load battery consumer icon and label into the background" into sc-dev 2021-05-24 11:41:18 +00:00
Betty Chang
c2ca77065f 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: I6a953045c767152c690270552f46e52b3a532326
 2021-05-24 06:52:31 +00:00
Alex Li
87ac929907 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: Ifed0e47f7345ce8079bbd4ec7db55680c4501e7b
 2021-05-24 06:52:22 +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
8869e994b8 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: Ia1ca587893e8aaac0a90f3bac88333ad51d79cdf
 2021-05-24 06:20:56 +00:00
Edgar Wang
5c739eeeac 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: I8467509cfebf3bf083bde7251c28835b3de35814
 2021-05-24 06:20:47 +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
ykhung
3ad391b0de Move load battery consumer icon and label into the background 
move high latency icon and label loading into the background thread to
improve the performance and first frame response time, which is also the
pre-work for checking whether a item is tappable or not feature (will
work this on the next patch)

Bug: 188751551
Test: make SettingsgRoboTests
Change-Id: I4e5712e995fce055d2735135c28be60fb70e5796
 2021-05-24 13:57:14 +08:00
Ryan Lin
3e1617bf54 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: I7c351a89e9cbce8a7378251bb5e01c38e365d4ed
 2021-05-24 03:43:35 +00:00
TreeHugger Robot
fe248ea8cf 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: I3120217bff3c510bcd5ad6d49b4c81d935c80447
 2021-05-24 03:43:30 +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
62023607ed 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: I9a3e42947a8681793ee278f228f3963d03b68e09
 2021-05-24 02:28:28 +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
f1e3313fa2 [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: I266ba1baa30d3817579ce1b6019664338a11eefd
 2021-05-23 05:27:22 +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
106c6c499a [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: Ia5e245a2b0f015c2ff79b20416db5e487f264392
 2021-05-23 05:20:05 +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
34fcbedb8f 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: I18e6570413717907a514a46f091ff52e65a4af7d
 2021-05-21 23:54:54 +00:00
TreeHugger Robot
9b2a2722e0 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: I3371d188a622418195881716b07871f5710174b4
 2021-05-21 23:54:25 +00:00
Chen Xu
7147880446 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: I852836d8af48855705076edb6c5c2d14ffc30949
 2021-05-21 23:53:45 +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
d6f4f8e53b 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: Ib92a5bcabb0ccbb5a98dedede8094fb7360153e6
 2021-05-21 18:24:22 +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
6c4ef9bff5 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: Ib4ed3210086b0c30c5d51c6960babb621d77dc62
 2021-05-21 17:26:48 +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
de88a588d8 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: I14c383832ff2497e8ac86fd57185b588c093d154
 2021-05-21 17:09:23 +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
66fd767629 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: I6bc699219da0bcce73bf42e798b0cec04e88a0ed
 2021-05-21 17:02:05 +00:00
Yi Jiang
f1d1765e38 Merge "Defers initialization of preferences." into sc-dev 2021-05-21 16:41:10 +00:00
YUKAI HUNG
88f5b5858f 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: I0b9ff9aa05e8075e87aceb5a2596e66a8aedc435
 2021-05-21 13:26:11 +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
486446e182 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: I63ba18bac5d1d99ea8a97f3e2cc355770a633efc
 2021-05-21 12:42:17 +00:00
Yanting Yang
5b6cb52c50 Merge "Introduce InteractionJankMonitor into Settings" into sc-dev 2021-05-21 12:26:41 +00:00
TreeHugger Robot
8ab9053cd8 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: I408e00dfc5c879de964686dbca05b9d17f5c74d6
 2021-05-21 09:58:36 +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