TreeHugger Robot
e161ec59dc
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533
-s ours
...
am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89fc3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803341
Change-Id: I74fc436ded08114312544556de5293486fc94442
2020-10-13 03:51:01 +00:00
TreeHugger Robot
4cee165533
Merge "Merge ab/6749736 in stage." into stage-aosp-master
2020-10-13 03:31:33 +00:00
Jason Chiu
4b3d851f41
Reduce the flickering of injected items when package is changed am: e4b2b77452
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: Ib2ff68b59e8aa9567d1f6f7c7281832dd323c2dc
2020-10-12 04:31:57 +00:00
Bill Yi
32105e95d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12799313
Change-Id: I17ae8fd63ae635042a95f0bd6bf44e0fda74c426
2020-10-09 13:32:50 +00:00
Xin Li
8656492241
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Bill Yi
de21809c01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b4ef8198075875b40875e95144cb7d130f10a70
2020-10-08 20:51:34 -07:00
TreeHugger Robot
ad20bb4875
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297
Change-Id: Iba3addc036b56f1a5ab431368e3f1dac952897ef
2020-10-07 18:19:37 +00:00
TreeHugger Robot
7e1d22baf9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12782680
Change-Id: Ibceea2a0db7cd86d1060c3035d1306127e921ebf
2020-10-07 18:19:00 +00:00
TreeHugger Robot
f0313f1328
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-07 18:03:32 +00:00
TreeHugger Robot
d0147558bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-07 17:49:45 +00:00
Bill Yi
4c00a7338e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I194219f78cffa0b5e0c6e3230158dd700a7fc31a
2020-10-07 07:10:55 -07:00
Bill Yi
d387c33f9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iffd874c0f7449ca10692e382178347b5c9db8088
2020-10-07 06:24:54 -07:00
Jason Chiu
e4b2b77452
Reduce the flickering of injected items when package is changed
...
Root cause:
Settings listens to four package-related broadcasts in order to refresh
injected items because UI data may change. However, when the system is
updating apps on the first boot, it triggers a burst of broadcasts. For
each broadcast Settings will reload and then redraw all injected items,
which leads to the flickering.
Solution:
1. When Settings recieves a broadcast, check if there are already two
reloading tasks to avoid redundant updates.
2. In the reloading task, check if any injected item is changed, added,
or removed to notify categories changed.
3. Only refresh the UI when any of the changed items belongs to the
current page.
Bug: 166785977
Bug: 168309941
Test: manual, robotest
Change-Id: I77745b60f84510554bff1870a5bb7a8013eab528
Merged-In: I77745b60f84510554bff1870a5bb7a8013eab528
(cherry picked from commit 20df25e6b9
)
2020-10-07 17:49:17 +08:00
Alexander Dorokhine
94fa8e0921
Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07
am: 1b69ab26e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661
Change-Id: I86b367dd8c072aeb8de4a610e7cf6c19fc5c8287
2020-10-06 11:05:22 +00:00
Alexander Dorokhine
1b69ab26e9
Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661
Change-Id: Ifd04dfaf4e806be9ed084a7241ac1fba781511e1
2020-10-06 10:19:41 +00:00
Alexander Dorokhine
c5a500bf07
Merge "Migrate away from deprecated Truth APIs."
2020-10-06 09:46:44 +00:00
Alexander Dorokhine
6decca7890
Migrate away from deprecated Truth APIs.
...
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.
Bug: 168765701
Test: m checkbuild
Merged-In: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
(cherry picked from commit 46e85a2fad
)
2020-10-06 00:25:04 -07:00
Treehugger Robot
2f068a914e
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
am: be8b195fe1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4
2020-09-29 06:04:54 +00:00
Treehugger Robot
be8b195fe1
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5
2020-09-29 05:29:24 +00:00
Treehugger Robot
722f9f4ea8
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
am: e13fa41a29
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
am: 000159f6db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
2020-09-29 05:13:51 +00:00
Treehugger Robot
fc6cb188b5
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576
2020-09-29 05:13:43 +00:00
Treehugger Robot
177533ddbb
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"
2020-09-29 05:03:06 +00:00
Treehugger Robot
e13fa41a29
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: I9af0af7bbb19cfb1c7337960dc83fbc8e59eeab4
2020-09-29 05:00:53 +00:00
Treehugger Robot
000159f6db
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7
2020-09-29 05:00:44 +00:00
Treehugger Robot
e570e80eb8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: If991989404484407853bd8ac42430761d1e37018
2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
2020-09-29 05:00:12 +00:00
Treehugger Robot
b4093123de
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e
2020-09-29 04:46:44 +00:00
Treehugger Robot
e0890849cd
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: Ie004598ea8d432d931a54469c1229e1b215ea759
2020-09-29 04:46:30 +00:00
Treehugger Robot
8c58bd4520
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
2020-09-29 04:45:22 +00:00
Treehugger Robot
93cec35cea
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"
2020-09-29 04:33:23 +00:00
Treehugger Robot
27806fde5e
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest"
2020-09-29 04:30:56 +00:00
Treehugger Robot
1cd8904fc5
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest"
2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest"
2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"
2020-09-29 04:27:45 +00:00
Treehugger Robot
2532a70ba1
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
2020-09-28 02:25:26 +00:00
Treehugger Robot
6891dd4590
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I82d1bcd87109666b5b74e8d74811f423ae33105e
2020-09-28 02:12:11 +00:00
Treehugger Robot
7f6271364b
Merge "Avoid unexpected state changes for enhanced preferences"
2020-09-28 02:01:05 +00:00
tim peng
3501adcc86
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
am: f01d260512
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: Iaaef48f2af763fb1905596205bedd6b33574750e
2020-09-24 13:05:41 +00:00
tim peng
f01d260512
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: I92cf2605c1e9ee48abedc483a1e461d196b09ef2
2020-09-24 12:39:06 +00:00
tim peng
d3a9f472a2
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: Ie0aed850c6d0818070d162f4e99c633dc50ef204
2020-09-24 12:02:53 +00:00
tim peng
594849082b
Merge "Set highest priority as default value to Bluetooth codec"
2020-09-24 11:48:51 +00:00
Treehugger Robot
b6aa1db254
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
am: 37be325d99
am: b28e9291ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: I5b73f4ca105ae2584db008e87372dd52f4c2211c
2020-09-24 06:22:23 +00:00