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
dba0acdd9b
Merge "Fix output switcher will show 2 media session when remote playing" am: 7862d99079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771900
Change-Id: I2867fdea19d391639ad85bd1376e1bbe3ae5c216
2020-10-14 13:18:23 +00:00
TreeHugger Robot
7862d99079
Merge "Fix output switcher will show 2 media session when remote playing"
2020-10-14 13:02:38 +00:00
TreeHugger Robot
6222267d8a
Merge "Add the explicitly mutable flag for creating a PendingIntent" am: 3ed34cd538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12831276
Change-Id: Iae3a4874034466ccd9bc4a8d064d4126d78d8ac1
2020-10-14 10:55:29 +00:00
Treehugger Robot
6323230ef9
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
am: 6d5943e6b8
am: bfc09343cd
am: 2f3b18d91d
am: 26614064ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: I0ff62a87e29b981209b9767fb47ae06b9835cb44
2020-10-14 10:55:10 +00:00
TreeHugger Robot
3ed34cd538
Merge "Add the explicitly mutable flag for creating a PendingIntent"
2020-10-14 10:48:24 +00:00
Treehugger Robot
26614064ff
Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
am: 6d5943e6b8
am: bfc09343cd
am: 2f3b18d91d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948
Change-Id: I1d6dbebdbdcb573b400c781b990f54e0fd24f27c
2020-10-14 10:41:50 +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
Hugh Chen
e16a8077b5
Fix output switcher will show 2 media session when remote playing
...
Before this CL, output switcher will show 2 media sessions when
some apps are remote playing. The root cause is some apps will
also create local media sessions when they cast media to remote
playing.
This CL add condition to only show remote sessions on output switcher
if apps both have remote and local sessions.
Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I80479d35b2bb2e353cf41f41f457f2dfd15cadbf
2020-10-14 17:58:47 +08: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
Sunny Shao
0b0f237834
Add the explicitly mutable flag for creating a PendingIntent
...
- Android S+ to specify explicitly either FLAG_MUTABLE or FLAG_IMMUTABLE
when creating a PendingIntent.
- Suggest to use the FLAG_IMMUTABLE as default. Change it to
FLAG_MUTABLE while errors occur.
Fixes: 170162598
Fixes: 170162878
Fixes: 170163592
Fixes: 170164316
Fixes: 170164458
Fixes: 170164327
Fixes: 169794524
Fixes: 170165106
Test: build pass, manual test add an account and volume control panel
Change-Id: I5aec028f82bd74fc4530b95a7c144811055ae2c5
2020-10-14 09:38:51 +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
Yi Jiang
ef232594fd
Merge "Merge Screen Attention and Screen timeout Settings." am: 79dc82fb6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12560323
Change-Id: I83e6697a26bc46734d13ec5976939d3d102dcd3b
2020-10-14 05:34:34 +00:00
Yi Jiang
79dc82fb6f
Merge "Merge Screen Attention and Screen timeout Settings."
2020-10-14 05:07:40 +00:00
TreeHugger Robot
8e9ff9bc53
Merge "Fix crash on "Connection preferences"" am: 2228c642b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12797030
Change-Id: Ia1fbb154fafd03386dcc8a65d46d27ba2ae9c3f8
2020-10-14 04:03:49 +00:00
TreeHugger Robot
2228c642b8
Merge "Fix crash on "Connection preferences""
2020-10-14 03:36:43 +00:00
Sally
904a8fa369
Add Bold Text to Accessibility settings screen
...
Bug: b/110991537
Test: setting appears, atest ForceBoldTextPreferenceControllerTest
Change-Id: I001b078cafd2b6da62929ffa1a7a09ddb28c9854
2020-10-13 16:57:00 +00:00
Yi Jiang
f5d1841c9d
Merge Screen Attention and Screen timeout Settings.
...
Bug: 155051311
Test: atest
Change-Id: I6f6ee52618eab629a41b28982be32ead5f9ba08d
2020-10-13 00:47:13 -07:00
TreeHugger Robot
9c1f572646
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533
-s ours am: e161ec59dc
-s ours am: adf313878a
-s ours am: 6208cbfd9d
-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: If6a657422dbbca15909a1dbab0b3ffccb6be3be8
2020-10-13 05:01:12 +00:00
TreeHugger Robot
6208cbfd9d
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533
-s ours am: e161ec59dc
-s ours am: adf313878a
-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: I2a4a345f08f2b3423bbb9f1d9b0de95e0a994bfb
2020-10-13 04:50:31 +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
TreeHugger Robot
2f6c333614
Merge "Hide the contextual home architecture." am: 38e8565b6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803944
Change-Id: I6a39cb9c151f8ba4d67f6d0a8313ec473c6b7f99
2020-10-13 02:12:15 +00:00
TreeHugger Robot
38e8565b6e
Merge "Hide the contextual home architecture."
2020-10-13 01:54:55 +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
Yi-Ling Chuang
985825edbf
Hide the contextual home architecture.
...
The contextual home will default to being disabled in Android S.
Changing the feature flag could reenable it.
Fixes: 168179764
Test: launch Settings and don't see contextual cards
Change-Id: I9591b50c4fe882c8605a71490f56aef4156b3e80
2020-10-12 19:17:05 +08: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
Hugh Chen
3c33b6ea41
Add string for text of bluetooth switch
...
Bug: 153888620
Test: manually test
Change-Id: I60a791190abf535162f7ed1b80fe265482515137
2020-10-12 16:42:01 +08:00
Hugh Chen
84fe29ae79
Fix crash on "Connection preferences"
...
This CL adds a null check condition to avoid crash for
some device not support PrintManager.
Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-10-12 15:58:55 +08:00
jasonwshsu
fee9c2663a
Set the minimum height to the CheckBox
...
Root Cause: Touch target of "container" is too small, reported by
accessibility scanner. Suggest to enlarge bigger than 48dp.
Solution: Set the minimum height to the CheckBox layout. If the
container text in CheckBox is bigger than 48dp, it will follow the
layout_height="wrap_content".
Bug: 168264410
Test: manual test
Change-Id: I50362baefd692e6bfbef1778eb2a5b72dd35ab7a
2020-10-12 15:00:35 +08:00
Stanley Wang
604c607dc1
Merge "Fix the DUS Loader item can't be searched." am: e94d2581f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771902
Change-Id: Ia680bb8090bd57a0f37f484620d623b530896005
2020-10-12 06:16:48 +00:00
Stanley Wang
e94d2581f8
Merge "Fix the DUS Loader item can't be searched."
2020-10-12 06:05:16 +00:00
Jason Chiu
fd8e9d4115
[automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452
am: 4b3d851f41
am: 615e2493ac
-s ours am: cdfd8cc103
-s ours
...
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 e4b2b77452
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: I0eaf6207792507b88b410fe2c61a55a66c474919
2020-10-12 05:20:19 +00:00
Jason Chiu
b57a755c90
[automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452
am: fe66e87832
am: 3e5ce2c8e6
-s ours am: b9769e8f0b
-s ours
...
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 20df25e6b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: Ia5a27740bf19b88f3ed2de38b3945a7c4711080b
2020-10-12 05:19:46 +00:00
Jason Chiu
cdfd8cc103
[automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452
am: 4b3d851f41
am: 615e2493ac
-s ours
...
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 e4b2b77452
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: I27e371d678720285b90f0e3597ec2920a2f20d58
2020-10-12 05:06:13 +00:00
Jason Chiu
b9769e8f0b
[automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452
am: fe66e87832
am: 3e5ce2c8e6
-s ours
...
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 20df25e6b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880
Change-Id: I2086b8de2ef85d5398ea6e4f7fa5b67fa85cddf0
2020-10-12 05:05:36 +00: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
Jason Hsu
2d3f431f8a
Merge changes I02f03ccb,I0ee46dd9 am: a5085443ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12188904
Change-Id: I4fb623ef80809c584855b34131bdf622414c1dce
2020-10-12 04:27:04 +00:00
Jason Hsu
a5085443ff
Merge changes I02f03ccb,I0ee46dd9
...
* changes:
Extract UserShortcutType functions from ToggleFeaturePreferenceFragment
Add data class PreferredShortcut to replace inner class UserShortcutType
2020-10-12 03:56:20 +00:00
tim peng
4739a8b791
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" am: 84b956ca03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771881
Change-Id: Ic262bd420d6206f0217df9b6bf1a71d89253fe1b
2020-10-12 01:21:05 +00:00
tim peng
2678ff50e2
Merge changes from topic "update_entry" am: e5deddbe47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12763648
Change-Id: Ic2f71e2a54a995a8e3e71e70c3ee197ea22ae216
2020-10-12 01:20:54 +00:00
timhypeng
57bba89582
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 3084d063f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12698447
Change-Id: Ief46356498c80a18df3aefbbd045af6bff07864c
2020-10-12 01:20:48 +00:00
tim peng
84b956ca03
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController"
2020-10-12 01:04:18 +00:00