Commit Graph

59577 Commits

Author SHA1 Message Date
Automerger Merge Worker
a8e4c9a7f3 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f
Change-Id: Ic4244cf0d1a09ec727a0d4b320b7c314d933cc43
2020-02-27 02:29:17 +00:00
Automerger Merge Worker
4ed77a80dd Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a am: 915900ccdf
Change-Id: I58f65a15c403fc6b9cfc1e4f2e7ee06a52b1191c
2020-02-27 02:20:54 +00:00
Automerger Merge Worker
00f2c88984 Merge "Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: ad07d3c7ff" into rvc-qpr-dev-plus-aosp 2020-02-27 02:20:42 +00:00
Automerger Merge Worker
5eab0f2b5c Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: ad07d3c7ff
Change-Id: Ibe6b5405a84ef9b91f96a9dc4248f116f0bbf3fb
2020-02-27 02:20:32 +00:00
Automerger Merge Worker
f139ff2e41 Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: 56df848fba
Change-Id: I5130f1c8e9c20b8d00155be412bad092e388715a
2020-02-27 02:20:28 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
915900ccdf Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a
Change-Id: Ib7f349792430c0bf06f720be0656fe3dd5baf820
2020-02-27 02:09:01 +00:00
Automerger Merge Worker
ad07d3c7ff Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d
Change-Id: I3b01f14bdcca8926e367dba553909835d7fd308c
2020-02-27 02:08:45 +00:00
Automerger Merge Worker
56df848fba Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d
Change-Id: I627a586abfecd61434d0ab5191ae7b44d11fe632
2020-02-27 02:08:33 +00:00
Automerger Merge Worker
63f67ffb1a Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9
Change-Id: I76cfbbc6147fc441d532f43b53b05d0ffd01e1ba
2020-02-27 01:51:16 +00:00
Automerger Merge Worker
e58ea87a9d Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9
Change-Id: Iff4ea6685a8322161e88dcd2bb851b9059df2f58
2020-02-27 01:51:11 +00:00
TreeHugger Robot
e28bd9d6d9 Merge "Increase size of touch target" into rvc-dev 2020-02-27 01:34:28 +00:00
Automerger Merge Worker
3f7f4bb113 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: af7dab44ed
Change-Id: I481b6b898a20d9bdf8d7a73c68acb690c840c19d
2020-02-27 00:24:57 +00:00
Automerger Merge Worker
e99afc99b1 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 5145c82a2e am: da81e98492
Change-Id: I8653c681c09efea2adfd6a45544ba81163b80560
2020-02-27 00:18:01 +00:00
Automerger Merge Worker
e5f870cb5b Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5
Change-Id: Idedb5fed62a4ac912b6471f7a33ec11363fed7c5
2020-02-27 00:15:07 +00:00
Automerger Merge Worker
af7dab44ed Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68
Change-Id: I6f654f5c3384c5e155b9d6c0f8e13b33380ec680
2020-02-27 00:03:25 +00:00
Automerger Merge Worker
c980fd89d5 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68
Change-Id: Ie728ea640963c065ca38b95d0330143eaeed97a3
2020-02-27 00:00:52 +00:00
Automerger Merge Worker
da81e98492 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 5145c82a2e
Change-Id: Icd319494a30181c55bd6221e19814c8c0652dd41
2020-02-27 00:00:06 +00:00
Automerger Merge Worker
91715a9b68 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751
Change-Id: I7ecc380c7bbf300912a8956fdc985f8ea2112af9
2020-02-26 23:44:14 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
2020-02-26 21:46:38 +00:00
Julia Reynolds
fceea9d0a1 Increase size of touch target
Test: make
Fixes: 146848768
Change-Id: Ib1e5886f5953ed48b2a5b851a696e037124d45eb
2020-02-26 15:15:16 -05:00
kholoud mohamed
8ade7701e1 Minor change to cross profile setting subtext.
Bug: 140728653
Test: N/A
Change-Id: I9f112e19bbd6f0cb6a817797adac3e16abdfa4e0
2020-02-26 17:45:12 +00:00
Automerger Merge Worker
013eb4ed1c Include changes that happen when history is open am: 8b031276b7 am: 70e242c19c am: 28000977cc
Change-Id: I9ec4dfdfc92a32bf3ea59c025600e90b9841df7d
2020-02-26 16:45:27 +00:00
Automerger Merge Worker
8ab9a1ae8d Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: dfd34e2e8c
Change-Id: I296880b7dbbd87f646a261ebd6da9bd89c0db4a1
2020-02-26 16:44:20 +00:00
Automerger Merge Worker
d0776ff37d Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: d9a7a6f881
Change-Id: Id6c205ea48d1c3dc35fc5d1e729f06e556520f43
2020-02-26 16:40:46 +00:00
Automerger Merge Worker
28000977cc Include changes that happen when history is open am: 8b031276b7 am: 70e242c19c
Change-Id: Id6c6720fa3dc5d90175e905f6d92bb3d37452086
2020-02-26 16:26:14 +00:00
Automerger Merge Worker
dfd34e2e8c Include changes that happen when history is open am: 8b031276b7 am: d60d581e78
Change-Id: Icff65bc16a19467c20afc7d6c3ad699bf6383fc7
2020-02-26 16:25:49 +00:00
Automerger Merge Worker
d9a7a6f881 Include changes that happen when history is open am: 8b031276b7 am: d60d581e78
Change-Id: I9ff590d335e72b77298acee5a32d5e5e3d6a1964
2020-02-26 16:25:45 +00:00
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