Andrei-Valentin Onea
acfad23908
Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
am: 38747f76f3
am: 8e111e3de3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019
Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2
2020-10-19 15:26:01 +00:00
Andrei-Valentin Onea
8e111e3de3
Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
am: 38747f76f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019
Change-Id: I60df429605c78749c0259f7efffab026210a4977
2020-10-19 14:56:40 +00:00
Andrei-Valentin Onea
38747f76f3
Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019
Change-Id: I600c63a996b1684a2b801787d88974501062c073
2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba
Merge "Add support for @EnabledSince compat changes"
2020-10-19 14:19:31 +00:00
Bill Yi
6b937e8542
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863464
Change-Id: I0f3a41cdb6eb7df80718d40acf93e18fdfc5cc02
2020-10-17 19:47:21 +00:00
Bill Yi
e0c58e9b1b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ide6e88b9dfe1253577e04f8a0d664530db31842d
2020-10-17 11:35:11 +00:00
TreeHugger Robot
09a906b972
Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868
Change-Id: I0026c3fbb1bf26d68f203c36c49576deb6d79681
2020-10-16 22:42:07 +00:00
TreeHugger Robot
1a09d244d4
Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev
2020-10-16 22:18:33 +00:00
Amit Mahajan
0f36371e3e
Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
am: b09f09b02d
am: 0e5fdb184d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946
Change-Id: I282af7cad68106b706d6b6fa477d720797b74ad1
2020-10-16 07:48:10 +00:00
Amit Mahajan
0e5fdb184d
Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
am: b09f09b02d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946
Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d
Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946
Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Amit Mahajan
7b9edcde47
Merge "Add the extra "Ask every time" if supported only"
2020-10-16 06:21:34 +00:00
TreeHugger Robot
572317ad54
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12843506
Change-Id: I974c00175f51aff80549aaf850f658bf95b69e00
2020-10-15 04:26:23 +00:00
TreeHugger Robot
7ea9985044
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-10-15 04:00:32 +00:00
Bill Yi
5a1be6612c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic14ca287b29a6287c1541c308e33ddcede2717f7
2020-10-14 19:39:32 -07:00
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