Philip P. Moltmann
fc656da908
Merge "Don't show autofill settings if not enabled" into oc-dev
...
am: 32d3d383cb
Change-Id: I58a04882f08402e77f0e5e4c9d0b183a8a2679da
2017-04-27 16:56:20 +00:00
TreeHugger Robot
32d3d383cb
Merge "Don't show autofill settings if not enabled" into oc-dev
2017-04-27 16:43:21 +00:00
Pavel Grafov
84c3702050
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
...
am: 6e34174f72
Change-Id: Ic19583cb62f8f00831a5564c1f63fa1ede22efb6
2017-04-27 16:34:12 +00:00
TreeHugger Robot
6e34174f72
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
2017-04-27 16:23:06 +00:00
Julia Reynolds
afebbacc12
Merge "App & channel notification settings updates" into oc-dev
...
am: 8e305ee536
Change-Id: I49e3c39f7796048335f19da176d6dec276051e79
2017-04-27 15:24:02 +00:00
Julia Reynolds
8e305ee536
Merge "App & channel notification settings updates" into oc-dev
2017-04-27 15:11:38 +00:00
Philip P. Moltmann
d984e90b63
Don't show autofill settings if not enabled
...
The non-indexable keys of language-and-input on my angler are:
game_controller_settings_category, gesture_assist,
gesture_double_tap_screen, default_autofill
Fixes: 35956220
Test: Disabled auto-fill and looked at settings: did not find
autofill button and could not find auto-fill in search
Settings robolectric test
Merged-In: I0923e707422d1b1de5153a63fa3a5fe4773c055d
Change-Id: I0923e707422d1b1de5153a63fa3a5fe4773c055d
2017-04-27 15:10:02 +00:00
Denis Kuznetsov
b7dd1e7255
DO Disclosures: detailed application lists
...
am: 3de32ae4dc
Change-Id: I6af13a0cd991a038c2b93c8e62aa031113f414a1
2017-04-27 13:36:20 +00:00
Denis Kuznetsov
3dc6c32ab1
DO Disclosure: add UI that lists apps that were managed by owner: - had permissions granted by admin - were installed by owner via policy
...
am: 7db69b7a26
Change-Id: Ia3c2c560698e043ac2f8900c32e60df47ff9d06e
2017-04-27 13:36:04 +00:00
Denis Kuznetsov
3de32ae4dc
DO Disclosures: detailed application lists
...
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).
Bug: 32692748
Test: m RunSettingsRoboTests
Merged-In: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
Change-Id: I7d0041e4fada48bc56f6a6637614ac4471dba65a
(cherry picked from commit f0a61dd112
)
2017-04-27 13:29:13 +02:00
Denis Kuznetsov
7db69b7a26
DO Disclosure: add UI that lists apps that were managed by owner:
...
- had permissions granted by admin
- were installed by owner via policy
Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
Merged-In: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
(cherry picked from commit 60b2960cbb
)
2017-04-27 13:28:55 +02:00
Pavel Grafov
f9f980d315
Disable "Verify apps over usb" according to user restriction.
...
Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
Merged-In: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-27 11:51:00 +01:00
Felipe Leme
a0f134454f
Merge "Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:" into oc-dev
...
am: b21808bd6b
Change-Id: Id3d6bd2f3b76d51ff931b307ad7050b41c1b9d3a
2017-04-27 07:48:38 +00:00
TreeHugger Robot
b21808bd6b
Merge "Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:" into oc-dev
2017-04-27 07:40:45 +00:00
Fan Zhang
09a840ebab
Merge "Resolve intent before launching from DashboardFragment." into oc-dev
...
am: c028a7d976
Change-Id: Ie3f3d6b7e69df8fdb3ff4d7324fc395dccadc003
2017-04-27 05:52:28 +00:00
TreeHugger Robot
c028a7d976
Merge "Resolve intent before launching from DashboardFragment." into oc-dev
2017-04-27 05:47:30 +00:00
rongrong.x.gao
2277572041
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
am: 220e085953
...
am: 4ccf08c6d4
Change-Id: I252e7b0c491e4eadc3ebb55d8cfdc0ca5f51ecae
2017-04-27 04:12:39 +00:00
rongrong.x.gao
4ccf08c6d4
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
...
am: 220e085953
Change-Id: Ia1596c05770c7ecf48830bf37f2f040c20931606
2017-04-27 04:07:11 +00:00
rongrong.x.gao
220e085953
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
...
am: 2503ea04fb
Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6
2017-04-27 04:05:09 +00:00
Treehugger Robot
2503ea04fb
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
2017-04-27 03:56:27 +00:00
Felipe Leme
aa7a23b40d
Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:
...
- Moved to proper package.
- Returns right away when:
- AutofillService for package is already selected
- Autofill is not available
Bug: 37576671
Bug: 37673809
Test: manual verification
Test: make RunSettingsRoboTests -j90
Merged-in: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
Change-Id: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
2017-04-26 20:50:15 -07:00
Maurice Lam
0c3e38b593
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
...
am: 2fc1fa6c41
Change-Id: Iace2ff261895f32bfbc158140c2002be40c1586f
2017-04-27 03:48:23 +00:00
TreeHugger Robot
2fc1fa6c41
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
2017-04-27 03:40:18 +00:00
Doris Ling
387b8c0f8e
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
...
am: 024bc8706d
Change-Id: If3adcf59fab58d331e34516fa161d44ae199e64c
2017-04-27 03:28:39 +00:00
TreeHugger Robot
024bc8706d
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
2017-04-27 03:22:21 +00:00
Jack He
a16bcf17d4
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
...
am: fdd8d3f6ae
Change-Id: Ie5d30226ef700f29af206416b8392fd9f6017784
2017-04-27 00:37:38 +00:00
TreeHugger Robot
fdd8d3f6ae
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
2017-04-27 00:32:12 +00:00
Fan Zhang
3c7ca105df
Resolve intent before launching from DashboardFragment.
...
Once dashboard tile is displayed, the underlying intent can be disabled.
We will eventually hide the item from UI, but there can be a brief
moment before we are able to hide it. So to prevent user click and
launch a non-exist intent, we will try to resolve it first before
launching anything.
Change-Id: Ic8d790bf3c5d4d269eadb757f789a1641928a7b7
Fix: 36036097
Test: make RunSettingsRoboTests
2017-04-26 14:44:12 -07:00
Doris Ling
cf4a185aeb
DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
...
This reverts commit 03ee253701
.
The change does not work properly and is causing confusion.
Bug: 36650108
Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
Fan Zhang
c02cbe698b
Merge "No autofill password when in PIN settings" into oc-dev
...
am: 3decc865dc
Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32
2017-04-26 21:10:23 +00:00
TreeHugger Robot
3decc865dc
Merge "No autofill password when in PIN settings" into oc-dev
2017-04-26 21:05:04 +00:00
Bill Yi
663f6ba460
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 4bce1569a1
-s ours
Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172
2017-04-26 19:55:12 +00:00
TreeHugger Robot
4bce1569a1
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-26 19:45:03 +00:00
Sundeep Ghuman
f292f23c0c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 9797a39ad7
Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3
2017-04-26 18:45:09 +00:00
Sundeep Ghuman
9797a39ad7
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-26 18:32:48 +00:00
Maurice Lam
c7e0fd90fb
Enable redaction interstitial after setting up pattern
...
Test: cd tests/robotests && mma
Bug: 37514884
Change-Id: Ie9342ca0ea893a687284d8b864c6d53a79f88086
2017-04-26 17:54:55 +00:00
Charles He
4aad6f98f4
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
...
am: 09317a6545
Change-Id: I90022bf37658816f0d8deb9729f2682946389c22
2017-04-26 13:35:52 +00:00
Charles He
09317a6545
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
2017-04-26 13:29:44 +00:00
Fan Zhang
07309c8f2a
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
...
am: f650c82b16
Change-Id: Ib986a31914727d56ce4b71f360f5dd5f6ebf1dc6
2017-04-26 00:14:45 +00:00
TreeHugger Robot
f650c82b16
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
2017-04-26 00:06:42 +00:00
Bill Yi
35c16ec044
Import translations. DO NOT MERGE
...
Change-Id: I9e0bfb7ce4c27874f4ce613b12e7c9bf7e9a3fed
Auto-generated-cl: translation import
2017-04-25 16:18:44 -07:00
Daniel Nishi
23f6fcf90a
Merge "Don't shows Files when storage is adopted." into oc-dev
...
am: 980155fb30
Change-Id: I90995dd52b20df2c1dcfe4670835bfd3988d6b41
2017-04-25 22:39:54 +00:00
Daniel Nishi
3803bb966d
Merge "Don't crash on opening ejecting USB." into oc-dev
...
am: 32f95292bf
Change-Id: Iaceb5e9ec424cf8dc175ab4d2645c50eacc86408
2017-04-25 22:39:35 +00:00
Felipe Leme
999f6a9a29
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
...
am: c36ed203db
Change-Id: I5c27b2def2e7bea0c0cf575f5ff18db032b4519d
2017-04-25 22:38:20 +00:00
Daniel Nishi
980155fb30
Merge "Don't shows Files when storage is adopted." into oc-dev
2017-04-25 22:30:29 +00:00
Daniel Nishi
32f95292bf
Merge "Don't crash on opening ejecting USB." into oc-dev
2017-04-25 22:30:14 +00:00
TreeHugger Robot
c36ed203db
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
2017-04-25 22:27:09 +00:00
Sundeep Ghuman
87bf49a436
Force update APs when enabling wifi in WifiSettings.
...
This reverts commit b2bdc8f17b
and fixes a broken Espresso test case.
Reason for revert: Rolling forward after fix in ag/2133493, to fix b/37324736
Bug: b/37324736
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
2017-04-25 15:12:00 -07:00
Julia Reynolds
bcf0c83ae2
Merge "'Allow sound' = let the app decide" into oc-dev
...
am: f9bfab880e
Change-Id: I6f0fa367832a2b02af2b05ce563f59f8cf77ead2
2017-04-25 21:56:00 +00:00
jackqdyulei
0fbccaa30b
Merge "Distribute the misc among all the apps" into oc-dev
...
am: e494a3e59b
Change-Id: I58dbff46d38402162ce69e49f8d647efcb64fff2
2017-04-25 21:55:34 +00:00