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
Yi Jiang
ae7ff0c7f1
Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController"
2020-02-26 21:41:40 +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
e9da740163
Include changes that happen when history is open am: 8b031276b7
am: 70e242c19c
am: 28000977cc
am: 013eb4ed1c
...
Change-Id: Ief1df09670010ab4a81937c0fea9ba7374c50687
2020-02-26 16:59:12 +00:00
Automerger Merge Worker
58660b1d4f
Include changes that happen when history is open am: 8b031276b7
am: d60d581e78
am: dfd34e2e8c
am: 8ab9a1ae8d
...
Change-Id: Ia6544e7ed8cff02a4f1612ab2a010d60d9a24498
2020-02-26 16:58:57 +00:00
Automerger Merge Worker
25e78ab67b
Include changes that happen when history is open am: 8b031276b7
am: d60d581e78
am: d9a7a6f881
am: d0776ff37d
...
Change-Id: I3fbd30feb8534e8e29d387bb37d25a2c10a747b4
2020-02-26 16:58:32 +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
f64e2b3d10
[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
...
Bug: 149307162
Test: Manual and make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
2020-02-26 18:30:14 +08: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
8317445949
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
am: 907051e8c0
am: 4d16f6d18f
am: caed2afc73
...
Change-Id: I3262262898b3d778454a2bc07757261ca73e9c89
2020-02-26 05:34:35 +00:00
Automerger Merge Worker
f5d440258a
Merge "Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
am: 1d63b3f5c6" into rvc-d1-dev-plus-aosp am: 737d47ecea
am: f891b009fd
...
Change-Id: I5891592cef7483f298491bb1c62c407d0460605e
2020-02-26 05:34:29 +00:00
Automerger Merge Worker
22d09f7a23
Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
am: 907051e8c0
am: fe90e0f750
am: cd83b8f450
...
Change-Id: I80e5fb347e321974a0cf97df76595cf29b36a5d1
2020-02-26 05:34:18 +00: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
66ae75c8dd
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
am: 69951f1926
am: 7d8bcb087d
am: 72c2645445
...
Change-Id: I8434ad0671f4986fc6b8a7fc16136eed754903bb
2020-02-26 03:52:11 +00:00
Automerger Merge Worker
8179877570
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
am: 89e1d0d6d2
am: 78c5cb71a9
am: 4c3979bbce
...
Change-Id: Ife949c83f4e979db982083baf998f4bcb3b3c16f
2020-02-26 03:51:34 +00:00
Automerger Merge Worker
d86ca7edef
[automerger skipped] Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
am: 399dcf8f6d
am: 9d747430ee
-s ours am: 371dcfa52a
-s ours
...
am skip reason: Change-Id I98f49d055db9427d91a3f1ca816e94a11d29cd3d with SHA-1 ab05476fc1
is in history
Change-Id: I1798544e8f5a5a3d713f32999804ef03c1d68f34
2020-02-26 03:51:00 +00:00
Automerger Merge Worker
d69ad8bb59
[automerger skipped] 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 am: fe703df3da
-s ours
...
am skip reason: Change-Id I98f49d055db9427d91a3f1ca816e94a11d29cd3d with SHA-1 ab05476fc1
is in history
Change-Id: Ie4869865f040bedb626a165ad5e94f7617d6ef2d
2020-02-26 03:49:48 +00:00
Automerger Merge Worker
635b15e22e
Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
am: 69951f1926
am: 85f479340d
am: 76a9c15f03
...
Change-Id: I96c99525084e264ff2465455d5b4e11cb5ab19b2
2020-02-26 03:49:22 +00:00
Automerger Merge Worker
03c503c452
[automerger skipped] Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
am: 399dcf8f6d
am: aed2966e0c
am: 7f940a8714
-s ours
...
am skip reason: Change-Id I98f49d055db9427d91a3f1ca816e94a11d29cd3d with SHA-1 10bc375176
is in history
Change-Id: I18ed1076b98086bba81403a380b61d02813b3ecc
2020-02-26 03:48:38 +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