Jeff DeCew
03ebcc2474
Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792910
Change-Id: I55f6310b344baebfe6a4425d3644d22d8e479638
2020-10-14 14:41:46 +00:00
Jeff DeCew
e9523b7636
Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev
2020-10-14 14:26:56 +00:00
Treehugger Robot
2f3b18d91d
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
am: 6d5943e6b8
am: bfc09343cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: If24b7f4cd32244d6db62d6757760375a35357143
2020-10-14 10:27:47 +00:00
Treehugger Robot
bfc09343cd
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
am: 6d5943e6b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: I6778ca0c8bed83621ae5ea38c184ad338b81279e
2020-10-14 09:43:44 +00:00
Treehugger Robot
6d5943e6b8
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: I0ed900b4fcfb24200d68d7bbb802a5192d1f967b
2020-10-14 09:24:07 +00:00
Treehugger Robot
3eb10277da
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission"
2020-10-14 09:10:25 +00:00
TreeHugger Robot
adf313878a
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533
-s ours am: e161ec59dc
-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: I9c972593f7cdef6eb900fe6c0fd517685e7b0869
2020-10-13 04:22:40 +00:00
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
Taesu Lee
50ef14540d
Add the extra "Ask every time" if supported only
...
Test: manual
Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2020-10-13 10:13:50 +09:00
Jeff DeCew
5bfe1d3f9c
Update NotificationChannelSettings Preferences in place to prevent re-layout.
...
(cherry picked from commit b409b64045
)
Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
Merged-In: If6acf305c44085e502a3304ea57e409ce049b40f
2020-10-12 20:06:48 -04:00
Taesu Lee
7e0a1522c9
Remove dup READ_PRIVILEGED_PHONE_STATE permission
...
Test: build
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Change-Id: I877ac1631869e804a28a0f0d4c218ff1a8746dfd
2020-10-12 17:48:34 +09:00
Jason Chiu
615e2493ac
Reduce the flickering of injected items when package is changed am: e4b2b77452
am: 4b3d851f41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: I2407804b97257385d6ddf7c7a1a11365d66db00d
2020-10-12 04:49:08 +00:00
Jason Chiu
3e5ce2c8e6
Reduce the flickering of injected items when package is changed am: e4b2b77452
am: fe66e87832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: I51833ab9e852bedd3c5bb28dc233f142e66a3238
2020-10-12 04:49:02 +00:00
Jason Chiu
fe66e87832
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: Ia334ab14dd3aa48c0d48ad6adcfd50ecfcb3400a
2020-10-12 04:32:12 +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
b094391c1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours am: 32105e95d1
-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: I9cf8504ce4b8ae2347f9c877d5855a99908af577
2020-10-09 13:52:30 +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
Sarah Chin
f3d7860c70
Hide 'View plan' button in data usage settings
...
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.
Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-08 21:03:39 -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
Andrei Onea
f21ba0c650
Add support for @EnabledSince compat changes
...
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
2020-10-08 21:54:02 +01:00
TreeHugger Robot
6884db1c4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours am: ad20bb4875
-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: I5d4f16f1ac17690f33d46e58bd994018c6a37635
2020-10-07 18:34:26 +00:00
TreeHugger Robot
c70687517a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours am: 7e1d22baf9
-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: I4f96a36f90c43421b6d670dc236a46779c79f142
2020-10-07 18:34:13 +00: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
01236ed32f
Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07
am: 1b69ab26e9
am: 94fa8e0921
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661
Change-Id: I82dd6eb5510fd7e35bd2c0473725dc24780ce219
2020-10-06 11:17:56 +00: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
fafe12056c
Merge "Hide tethering option when in a guest account" into rvc-qpr-dev am: ab41be5607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723406
Change-Id: I4caa8937deae9bc104c9c6c3446b7f793cac1f80
2020-10-06 02:25:09 +00:00
TreeHugger Robot
ab41be5607
Merge "Hide tethering option when in a guest account" into rvc-qpr-dev
2020-10-06 02:06:23 +00:00
Bill Yi
45eb63a024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ea96cf6db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12762076
Change-Id: Ie0a71db474d15bf39badbe81c177db78f2e4cb7b
2020-10-05 05:14:57 +00:00
Bill Yi
7ea96cf6db
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8bcf35d1b5eae3e56f485fa78ade8eea9ecb2deb
2020-10-04 21:51:40 +00:00
Treehugger Robot
159de41477
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
am: be8b195fe1
am: 2f068a914e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809
Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
2020-09-29 06:18:19 +00: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
c0dbafc438
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea
am: b4093123de
am: e13fa41a29
am: 722f9f4ea8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565
Change-Id: I3f2fb62790ba30914d1b7a5555809954066e0455
2020-09-29 05:29:52 +00:00
Treehugger Robot
580963266b
Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
am: 000159f6db
am: 6513978872
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: Ia6cbd95f410a4763b5a4a066b942e1fcd44b0fb1
2020-09-29 05:29:43 +00:00
Treehugger Robot
4d513437aa
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
am: 24dc71f7e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
2020-09-29 05:29:33 +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
6ace0ecdde
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
am: bb98b793e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
am: 7f3bbcddf0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
2020-09-29 05:29:07 +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