TreeHugger Robot
e68a91fdc0
Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev am: 5f876de174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292670
Change-Id: Ie1d96e81e00c4c9f4538163dadc023e73284ed34
2021-04-26 07:35:04 +00:00
TreeHugger Robot
5f876de174
Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev
2021-04-26 07:16:02 +00:00
TreeHugger Robot
4a1d52b1d6
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: I344c03d0ba485cc6295cb5bc835fb77e352b05bb
2021-04-26 06:39:58 +00:00
Betty Chang
ecb3845e5c
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: Id751806a7e6da912e837a1fb8b08805594726a3e
2021-04-26 06:39:44 +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
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
2b25e11bf6
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: I7793936888172a994195a11837acfd85cd435a9d
2021-04-26 05:18:14 +00: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
fd927adec3
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: I40aeb90b7b175e0e6bba671931b63b5b28234b29
2021-04-26 04:04:38 +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
81850c1a7a
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: I2abb035fc3b86649772562072487d996e9cb09e0
2021-04-26 03:27:04 +00:00
TreeHugger Robot
4cc4b47adf
Merge "Fix unable to change language" into sc-dev
2021-04-26 03:11:34 +00:00
Joshua Mccloskey
ecdce82c6f
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: Ia1eb05aabe80e2617c6854a18852423ee3ecfaf2
2021-04-25 23:29:19 +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
f64775502a
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: I746e0ef1f7330d78f001c1b1ce92beac5464597b
2021-04-25 11:23:33 +00:00
ykhung
1d54252b9f
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: I394b045149277fff4bf4712849ef300a50c99b7d
2021-04-25 11:23:31 +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
b7d64ed7e7
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: I0541a077707c635124bd89211f154234cad81c84
2021-04-24 15:59:26 +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
ab4e189c58
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: Ice2a60064723c72f6203a9fb06edc0fcd58192e2
2021-04-24 13:15:33 +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
6847795ce6
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: I95ff44498dd066c991dad2e152a5a764b5f3ef50
2021-04-24 00:53:28 +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
c5afdce49d
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: I1189e3aff61536dd014bce38dca21c4ba9b72959
2021-04-23 20:29:27 +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
99ed186650
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: I72c3d19cb78e2e0507dc732ec5cd5c953a80b876
2021-04-23 19:33:28 +00:00
Chloris Kuo
b0ab98b92d
Merge "NAS setting onboarding string change" into sc-dev
2021-04-23 19:17:36 +00:00
TreeHugger Robot
ace841e0a2
[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: Ia8b6cc22ee9824aca763061a6b2f680805ce521c
2021-04-23 17:28:21 +00:00
Bill Yi
d9ff7d4813
[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: I8c0f829bf6325e6a4a66698dbde564c42dc8b2ff
2021-04-23 17:27:59 +00:00
TreeHugger Robot
e7c67bafc4
[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: Id7d7d66f8e0e46e7d251bb7b7de98bff7e4cb647
2021-04-23 17:27:41 +00:00
Bill Yi
472cfd26b7
[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: I7dbd5ab0244c08c7fc48f961303aa2fac0eb84b1
2021-04-23 17:27:10 +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
dcfbd36abd
[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: Ia330a01ba3b646c0d8350eb82de0b76753e0a78e
2021-04-23 16:55:15 +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
dbeb8728c8
[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: I22dc20b37955b13799ab5ade7189e89a42dadab0
2021-04-23 16:54:44 +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
291385e776
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-23 16:46:41 +00:00
TreeHugger Robot
3358ed3ca0
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-23 16:42:38 +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