Automerger Merge Worker
70e242c19c
Include changes that happen when history is open am: 8b031276b7
...
Change-Id: I46e0855230e7f2cd36fbd3f38ec27d0a5f992074
2020-02-26 16:13:36 +00:00
Automerger Merge Worker
d60d581e78
Include changes that happen when history is open am: 8b031276b7
...
Change-Id: Ia3745b7d99ef5acae3becb123be35548f8dacda6
2020-02-26 16:13:15 +00:00
Dan Sandler
f9a8552f74
Support updated rendering of conversation icons.
...
Note that changes to channel settings now generate
onResume() for all available controllers to ensure they get
the updated drawable.
Bug: 149747760
Change-Id: I3f73c025b1d32194e3d5147d03cb781e370f2a1b
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
2020-02-26 11:09:38 -05:00
jasonwshsu
5c38960848
Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)
...
* AccessibilityShortcutPreferenceFragment was removed,
ShortcutServicePickerFragment should also removed.
Bug: 142529032
Test: Manual test
Change-Id: I08f96a3794235d308b10f3846f1b4f7bb4306923
2020-02-26 21:17:59 +08:00
Sunny Shao
721f60515d
Let footer with learn more become selectable
...
- Update this attribute after synced with the Switch Access team.
Bug: 149808249
Test: manual test
Change-Id: I8e4fb7738541b4ccbbb5acf643265c78a61f8c45
2020-02-26 13:08:01 +00:00
Julia Reynolds
8b031276b7
Include changes that happen when history is open
...
Test: manual
Fixes: 150202759
Change-Id: Ic05be6c5c85a16567556d3f3902f4d557a8e7c1f
2020-02-26 12:42:57 +00:00
changbetty
288fa30c2d
[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
...
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
2020-02-26 18:23:31 +08:00
Automerger Merge Worker
caed2afc73
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 am: 4d16f6d18f
...
Change-Id: I2416cd9398150b60711c464aef0d29a525f54c72
2020-02-26 05:20:26 +00:00
Automerger Merge Worker
f891b009fd
Merge "Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 1d63b3f5c6" into rvc-d1-dev-plus-aosp am: 737d47ecea
...
Change-Id: If0a3df9cbe3583f752c618212fcfa736f605fd6e
2020-02-26 05:20:17 +00:00
Automerger Merge Worker
cd83b8f450
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 am: fe90e0f750
...
Change-Id: If6af0103a45415381631caea38cdde28d6c4e386
2020-02-26 05:20:08 +00:00
Automerger Merge Worker
737d47ecea
Merge "Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 1d63b3f5c6" into rvc-d1-dev-plus-aosp
2020-02-26 05:00:48 +00:00
Automerger Merge Worker
4d16f6d18f
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0
...
Change-Id: Ie99e2f168791876118132974917f4585bca7b8db
2020-02-26 05:00:40 +00:00
Automerger Merge Worker
278f6d7c5b
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 1d63b3f5c6
...
Change-Id: I843980b9d3af5968e1ed631aca721121f8ddc1b7
2020-02-26 05:00:40 +00:00
Automerger Merge Worker
fe90e0f750
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0
...
Change-Id: Ide5a5710d57542e239105c5e14ab11f3167ab42b
2020-02-26 05:00:35 +00:00
Automerger Merge Worker
1d63b3f5c6
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
...
Change-Id: Id570b28ba84f3d7de23fe399044f99d6766f0ede
2020-02-26 04:45:05 +00:00
Automerger Merge Worker
907051e8c0
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
...
Change-Id: Iec32172aa8bf4222e235c7bc7b6991f6c25ed9f9
2020-02-26 04:44:49 +00:00
Julia Reynolds
9f6351b596
Merge "Stop controller from steal preference clicks" into rvc-dev
2020-02-26 04:32:52 +00:00
Automerger Merge Worker
72c2645445
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 69951f1926 am: 7d8bcb087d
...
Change-Id: Id0b64b0489166d839220cc44f3355b6e6b4a3f19
2020-02-26 03:30:57 +00:00
Automerger Merge Worker
4c3979bbce
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 89e1d0d6d2 am: 78c5cb71a9
...
Change-Id: I00a467961a7ef4527bb8950e13faaf7d5e791c6f
2020-02-26 03:30:39 +00:00
Automerger Merge Worker
371dcfa52a
[automerger skipped] Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: 399dcf8f6d am: 9d747430ee -s ours
...
am skip reason: Change-Id I98f49d055db9427d91a3f1ca816e94a11d29cd3d with SHA-1 ab05476fc1 is in history
Change-Id: Ic219ba113c2cc82c84fbe1f1ce30b89338d13bca
2020-02-26 03:29:38 +00:00
Automerger Merge Worker
fe703df3da
Merge "Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: e6dfc725db am: d6cdf25c03" into rvc-qpr-dev-plus-aosp
2020-02-26 03:28:06 +00:00
Automerger Merge Worker
76a9c15f03
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 69951f1926 am: 85f479340d
...
Change-Id: Ib937af1e5651132cf3402ab09bbaaae419f994e7
2020-02-26 03:28:02 +00:00
Automerger Merge Worker
afba6a2461
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: e6dfc725db am: d6cdf25c03
...
Change-Id: I13d0a8311333eaf0741b320cfc83ff31dc7e0cc9
2020-02-26 03:28:02 +00:00
Automerger Merge Worker
7f940a8714
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: 399dcf8f6d am: aed2966e0c
...
Change-Id: I730fb2e3d6e97c32d0e77057bea6e4a2cadc1921
2020-02-26 03:27:33 +00:00
Automerger Merge Worker
7d8bcb087d
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 69951f1926
...
Change-Id: I03926c528e85f6a36dc61d656dfcd8bca5cb27fb
2020-02-26 03:14:01 +00:00
Automerger Merge Worker
85f479340d
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 69951f1926
...
Change-Id: Ibb889ba09a9a1820cc0565195d4c99a13b4ed34e
2020-02-26 03:12:38 +00:00
Automerger Merge Worker
78c5cb71a9
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 89e1d0d6d2
...
Change-Id: Id8c701e97240bbd38199625d9e4689708ed5096c
2020-02-26 03:12:38 +00:00
Automerger Merge Worker
aed2966e0c
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: 399dcf8f6d
...
Change-Id: Ic7ec2f62c5645e4b20d685e46ad71a4d0e6e0884
2020-02-26 03:12:30 +00:00
Automerger Merge Worker
9d747430ee
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: 399dcf8f6d
...
Change-Id: I64535027dd94cee097a863062c8c7ecd99770115
2020-02-26 03:12:14 +00:00
Automerger Merge Worker
d6cdf25c03
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: e6dfc725db
...
Change-Id: I625ee6e94bbc694c8318ce966ee78a144b47938e
2020-02-26 03:12:00 +00:00
Automerger Merge Worker
89e1d0d6d2
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
...
Change-Id: Ie944bb2163d7db1e642b4f742d4fbf88563e4993
2020-02-26 03:04:06 +00:00
Automerger Merge Worker
e6dfc725db
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
...
Change-Id: I644d6ae2ccebe74f3f6201e4b5595d06559d83da
2020-02-26 03:03:54 +00:00
Automerger Merge Worker
69951f1926
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
...
Change-Id: I7dafd083d3e24610692edf1587de7f5f44c457b2
2020-02-26 03:03:17 +00:00
Automerger Merge Worker
399dcf8f6d
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
...
Change-Id: I3f6687e6e8988faa04799c0dabffdcc59e74e3a0
2020-02-26 03:03:06 +00:00
Raff Tsai
a4c7cb1ee2
Merge "Change text size to align with that in launcher" into rvc-dev
2020-02-26 02:52:42 +00:00
Julia Reynolds
bc0c7a626d
Stop controller from steal preference clicks
...
Test: atest
Fixes: 150175360
Change-Id: Ia22058df0ddbd1a274a508e2600d12aa1b67a343
2020-02-25 10:49:23 -05:00
Peter_Liang
ab05476fc1
Fine-tune the widget of "Allow rich content in Accessibility Settings" for security.
...
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.
Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
Merged-In: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
(cherry picked from commit 10bc375176 )
2020-02-25 09:06:12 +00:00
Automerger Merge Worker
b4fd23207c
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: f0256943f0
...
Change-Id: I21e0459d8c9ad94c777b2e7251913fa044cf8ec5
2020-02-25 08:07:16 +00:00
Automerger Merge Worker
f53a5b71c3
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881 am: 6a0d69c9b6
...
Change-Id: Ia9e3862aeccc81bdcf3fb9960a6f670a5a563773
2020-02-25 08:07:08 +00:00
Automerger Merge Worker
f5b2f92b22
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: 7991e1fe7a
...
Change-Id: I16be37023bdafc73af59b044118b51ea38c72958
2020-02-25 08:07:01 +00:00
Automerger Merge Worker
f0256943f0
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37
...
Change-Id: I272b679a7d6eeb0d571f7f052884c1a8725f8f56
2020-02-25 07:59:44 +00:00
Automerger Merge Worker
6a0d69c9b6
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881
...
Change-Id: I444bba0f7568d6d488b8559a37b6ec9f30d2d697
2020-02-25 07:59:42 +00:00
Automerger Merge Worker
7991e1fe7a
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37
...
Change-Id: Ib8cb42e69124e79c455a78efae655f99be3921c5
2020-02-25 07:59:29 +00:00
Automerger Merge Worker
622e966881
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b
...
Change-Id: I38485ff2569e2c3e679676c490c25ddb25d86145
2020-02-25 07:48:31 +00:00
Automerger Merge Worker
aa0e7e8d37
Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b
...
Change-Id: I491a6b9fda42d5173040000bb286c448d830aad2
2020-02-25 07:48:12 +00:00
Tim Peng
14d0d125b4
Launch output switcher with media package information
...
-Output switcher would include transferable devices when media is active
-Output switcher would only include system devices when no media is active
-Add test cases
Bug: 150179490
Test: make -j42 RunSettingsRoboTests
Change-Id: Ice0048d3a0b78e02ec21dd3664efc0239abbb9cb
2020-02-25 15:45:56 +08:00
Jack Yu
490eba353b
Merge "Added slot index in area info broadcast" into rvc-dev
2020-02-25 07:41:37 +00:00
Raff Tsai
c4d5ccdef1
Change text size to align with that in launcher
...
Fixes: 150129990
Test: visual
Change-Id: I89bd2edba85a980235cf3dec2926cc7d278f7bc2
2020-02-25 11:39:46 +08:00
Automerger Merge Worker
7300bab2b6
Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd
...
Change-Id: I9b1343aa6bd45384bd0a297b7c595af4ea2f6d18
2020-02-24 21:58:13 +00:00
Automerger Merge Worker
e6c57426cd
Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a
...
Change-Id: I1dc710279b2a6fbfeac34951121ed9d7c3a4ee0a
2020-02-24 21:48:28 +00:00