TreeHugger Robot
f9dbcb8c21
Merge "Make app usage page support legacy version" into sc-dev am: e39066c388
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271580
Change-Id: I2bcc2aaaa53fcc10bcf7877881f8d37df2dbc596
2021-04-26 06:41:43 +00:00
Betty Chang
381d6f194a
Merge "Add TextWatcher for the ip config field" into sc-dev am: 75d6293a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299194
Change-Id: Ic54172c971e412df449e5ea27f0a927624a84bdb
2021-04-26 06:41:34 +00:00
TreeHugger Robot
e39066c388
Merge "Make app usage page support legacy version" into sc-dev
2021-04-26 06:34:28 +00:00
Betty Chang
75d6293a50
Merge "Add TextWatcher for the ip config field" into sc-dev
2021-04-26 06:17:56 +00:00
jasonwshsu
590dafc083
Wrap a white adaptive background if it is not an AdaptiveIcon am: 9b284a9af1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233640
Change-Id: I18a704c56d0ec125435591e96b7a9b8342752d07
2021-04-26 05:20:06 +00:00
Wesley.CW Wang
d67f878c67
Make app usage page support legacy version
...
- Add a flag to divide legacy and new design
- Add new layout for tristate design
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I61f694cad8ac9cea8195191feacbe80bac2df62e
2021-04-26 13:18:33 +08:00
jasonwshsu
9b284a9af1
Wrap a white adaptive background if it is not an AdaptiveIcon
...
Bug: 183501919
Test: manual test
Change-Id: I6a899aa0fcb724d5318274190f359080fc2d0615
2021-04-26 05:01:00 +00:00
changbetty
244268b98d
Add TextWatcher for the ip config field
...
[Root Cause]
We always check the valid for the ip config field. If the text is empty
we will set the default for user even if user deleted the values.
[Solution]
Add TextWatcher for the ip config field (include gateway/network prefix
length/dns1). If the text change and the text is empty, we will set the
hint for user, not the default.
Bug: 179331339
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2
Change-Id: I1976200c70ae768285a44aff5df54ced00a78171
2021-04-26 12:53:08 +08:00
YUKAI HUNG
ca18b0883d
Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev am: 8ec6502699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299196
Change-Id: I4817d27989abbfca8f4c967596e92ddfa74e49e0
2021-04-26 04:06:29 +00:00
YUKAI HUNG
8ec6502699
Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev
2021-04-26 03:43:50 +00:00
TreeHugger Robot
5619486876
Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671
Change-Id: I05058a4bea3682405236959a7bb60cedfbd1856c
2021-04-26 03:28:49 +00:00
TreeHugger Robot
4cc4b47adf
Merge "Fix unable to change language" into sc-dev
2021-04-26 03:11:34 +00:00
Joshua Mccloskey
a5ba299ab7
Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131
Change-Id: I59b0e7aac88f85382ef8513a53a356f265b17fd0
2021-04-25 23:34:39 +00:00
Joshua Mccloskey
5487f2fa6c
Merge "Updated settings for new get/set feature change" into sc-dev
2021-04-25 23:20:35 +00:00
ykhung
3a6bdd5c11
Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195
Change-Id: Ia57002ef0ff4f085f89271eb7bf65b5e53199ff9
2021-04-25 11:25:20 +00:00
ykhung
3fa5df6ec7
Refresh category title by different time slot condition am: 41fd8a7494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187
Change-Id: Ic548683719cf72a5a9ad168f6f4b8b610bd83784
2021-04-25 11:25:19 +00:00
ykhung
75c5fc5906
Wrap and carry clicked slot information data for restriction page
...
Refresh category title by different time slot condition
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I006f6825fdb471f863c0355c65bfc4ca9d980191
2021-04-25 11:05:03 +00:00
ykhung
5e578ddd13
Fix incorrect battery history merging logic to cause data losing
...
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic26799f4d95b9f990e873ee26a42d6cc0c404659
2021-04-25 08:35:55 +00:00
ykhung
41fd8a7494
Refresh category title by different time slot condition
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ib124e1cfb9549f838540ff547bc616049f65180d
2021-04-25 07:47:31 +00:00
Santos Cordon
f7b6e27c94
Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526
Change-Id: Ia12243c9edbe07502d3948a6f51c45e64a320446
2021-04-24 16:01:09 +00:00
Santos Cordon
219dabcabf
Merge "Use new getBrighntessInfo() API for brightness" into sc-dev
2021-04-24 15:38:20 +00:00
YUKAI HUNG
34f4df5a48
Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275
Change-Id: Ie55a76e212c3dc33d8c82c5d2cb62496784cd418
2021-04-24 13:17:14 +00:00
YUKAI HUNG
230c3f2de0
Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev
2021-04-24 13:03:08 +00:00
ykhung
ef6cea8c84
Add test cases for utcToLocalTime in the ConvertUtils
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I22bda2db821e69c40202db692ada52e96af25e16
2021-04-24 13:41:45 +08:00
Julia Reynolds
c74fcc9f52
Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890
Change-Id: I8d4d02f6769de4de84d7a46781f7b0dca91f804d
2021-04-24 00:55:22 +00:00
Julia Reynolds
9d77efb7e7
Merge "Move preference loading to a background thread" into sc-dev
2021-04-24 00:34:26 +00:00
TreeHugger Robot
8dc93befa6
Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593
Change-Id: I670eeadb081514dc41bc8923ab60667cd28dab34
2021-04-23 20:31:22 +00:00
TreeHugger Robot
8eec01fc17
Merge "Do not auth in settings if UDFPS" into sc-dev
2021-04-23 20:12:46 +00:00
Julia Reynolds
aee53bc98d
Move preference loading to a background thread
...
To improve the loading time of the Notifications screen. Also introduce
placeholder preferences to minimize jank when the data becomes available
Test: Robotests, adb shell am start -W -a android.settings.NOTIFICATION_SETTINGS
Fixes: 185877371
Change-Id: Id63469fdb42e1a66468f2c5f1da8c366686f06e4
2021-04-23 19:48:02 +00:00
Chloris Kuo
4a1526263f
Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599
Change-Id: Ibaca3e55dd95b9b33e4bfcc9bef19814318f6a7c
2021-04-23 19:38:04 +00:00
Chloris Kuo
b0ab98b92d
Merge "NAS setting onboarding string change" into sc-dev
2021-04-23 19:17:36 +00:00
TreeHugger Robot
1861ec1bd7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: Iebfe764f561a7394b8521b150e16746e3b402e34
2021-04-23 17:29:51 +00:00
Bill Yi
6df96fb9e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I4ac484b450a48ca6617b5fdb8dcd418bbce5ec94
2021-04-23 17:29:47 +00:00
TreeHugger Robot
099e91276c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924
Change-Id: Iadd663cf86a84e45bdd98a5e29a90ecad714ffa6
2021-04-23 17:29:39 +00:00
Bill Yi
b1e98782ec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I8933f9fc78f71be325b1f2a02ea6db601c73a2ea
2021-04-23 17:29:08 +00:00
TreeHugger Robot
9f5f9bc960
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: I626e49c4ddce9a2410b4e7f2f4a89df47e341819
2021-04-23 17:19:14 +00:00
Bill Yi
4e9da6061d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I9db0d41fb1d64fdfcba7b172f7ea6fd039cfa2cb
2021-04-23 17:18:15 +00:00
TreeHugger Robot
bed3b3f0d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924
Change-Id: Id7417778176b4fe4fcecb558ea94a4f5fd0026da
2021-04-23 17:07:55 +00:00
Bill Yi
d7726af0d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I3092aed10393846f2becc03c781ad2ad48102142
2021-04-23 17:07:07 +00:00
TreeHugger Robot
13cae1a933
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f92d565f22 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295608
Change-Id: I7379fe1e1eab5e6d79ca0ec1e767c812cad10dd5
2021-04-23 16:57:14 +00:00
TreeHugger Robot
bd90819601
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 45a5592fd7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295606
Change-Id: I8df7b9ea904eb97e98838396d863a1e36106a946
2021-04-23 16:56:42 +00:00
TreeHugger Robot
be34fd7ec5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: I697cc38f78e22b125a9b041933125761408c9107
2021-04-23 16:55:10 +00:00
Bill Yi
b63c84d427
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I8b23a0c3bed86312eb39801637497f1b18c7e135
2021-04-23 16:55:05 +00:00
TreeHugger Robot
f7682416b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-23 16:53:04 +00:00
TreeHugger Robot
f92d565f22
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-23 16:41:57 +00:00
TreeHugger Robot
75de88c1d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-23 16:37:19 +00:00
TreeHugger Robot
45a5592fd7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-23 16:35:48 +00:00
Julia Reynolds
ee8f3b2273
Merge "Add enterprise popup to notif lockscreen settings" into sc-dev am: 16861ac068
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14284498
Change-Id: I33951af58be0b2a76ba65a7e796c0278e4cef753
2021-04-23 15:05:22 +00:00
Julia Reynolds
16861ac068
Merge "Add enterprise popup to notif lockscreen settings" into sc-dev
2021-04-23 14:46:19 +00:00
Tsung-Mao Fang
2b78aa0988
Fix unable to change language
...
In some cases, recycler view receives the cancel touch event,
it causes recycler view doesn't update the new locale list.
Currently, we also treat cancel event as a signal to update the locale.
According to the document, we can treat cancel event as a up
event, but not perform any action that you normally would.
It's ok in our case since we check if updated list is same as
last one in adapater.
Test: Drag and drop locale item, and make sure the language system
is updated.
Fix: 184051013
Fix: 184903189
Fix: 185000363
Change-Id: I06610080f34c5ed3562c74e1cdd955571cae55c0
2021-04-23 22:35:55 +08:00