Felipe Leme
d35129ea3d
Merge "Check for permission when displaying AutofilLServices." into oc-dev am: 5d27ad49a3
...
am: bb542f0894
2017-04-28 03:13:47 +00:00
Felipe Leme
bb542f0894
Merge "Check for permission when displaying AutofilLServices." into oc-dev
...
am: 5d27ad49a3
2017-04-28 03:05:54 +00:00
TreeHugger Robot
5d27ad49a3
Merge "Check for permission when displaying AutofilLServices." into oc-dev
2017-04-28 02:50:04 +00:00
Fan Zhang
b763f04b1e
Merge "Merge pointer/tts categories into one without heading" into oc-dev am: 4f4fe03a6e
...
am: 98ec71355b
2017-04-28 02:29:27 +00:00
Anton Philippov
72b505869f
Merge "Add summary for Backup menu in Settings." into oc-dev am: 646d996865
...
am: d1cc1365fc
2017-04-28 02:29:08 +00:00
Glen Kuhne
b7f7621b37
Merge "Disable submit button when PSK pass is invalid" into oc-dev am: 35cc22fcf2
...
am: 7038d26861
2017-04-28 02:28:43 +00:00
Doris Ling
32927bceeb
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev am: 64857437a4
...
am: 42126366f1
2017-04-28 02:28:23 +00:00
Doris Ling
69ef213f77
Merge "Add summary to special app access." into oc-dev am: 02619a6d9f
...
am: 1081882be6
2017-04-28 02:27:52 +00:00
Sudheer Shanka
35b23bcb53
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev am: f64c5236c7
...
am: e3961b402a
2017-04-28 02:27:20 +00:00
Fan Zhang
98ec71355b
Merge "Merge pointer/tts categories into one without heading" into oc-dev
...
am: 4f4fe03a6e
2017-04-28 00:07:42 +00:00
Anton Philippov
d1cc1365fc
Merge "Add summary for Backup menu in Settings." into oc-dev
...
am: 646d996865
2017-04-28 00:07:20 +00:00
Glen Kuhne
7038d26861
Merge "Disable submit button when PSK pass is invalid" into oc-dev
...
am: 35cc22fcf2
2017-04-28 00:07:00 +00:00
Doris Ling
42126366f1
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
...
am: 64857437a4
2017-04-28 00:06:38 +00:00
Doris Ling
1081882be6
Merge "Add summary to special app access." into oc-dev
...
am: 02619a6d9f
2017-04-28 00:06:18 +00:00
Sudheer Shanka
e3961b402a
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
...
am: f64c5236c7
2017-04-28 00:05:53 +00:00
Maurice Lam
2a1ec7307d
Revert "Fix Robolectric test on oc-dev. DO NOT MERGE"
...
This reverts commit 8352421baa
2017-04-28 00:02:34 +00:00
Fan Zhang
4f4fe03a6e
Merge "Merge pointer/tts categories into one without heading" into oc-dev
2017-04-27 23:34:00 +00:00
TreeHugger Robot
646d996865
Merge "Add summary for Backup menu in Settings." into oc-dev
2017-04-27 23:20:29 +00:00
TreeHugger Robot
35cc22fcf2
Merge "Disable submit button when PSK pass is invalid" into oc-dev
2017-04-27 23:11:47 +00:00
TreeHugger Robot
64857437a4
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
2017-04-27 23:08:20 +00:00
TreeHugger Robot
02619a6d9f
Merge "Add summary to special app access." into oc-dev
2017-04-27 22:31:48 +00:00
TreeHugger Robot
d0417e42f0
Merge "Allow view/update EAB Provisioning status"
2017-04-27 22:01:36 +00:00
Anton Philippov
ca5e1bd67b
Add summary for Backup menu in Settings.
...
'On'/'Off' depending on whether the backup is enabled in settings.
Refactors BackupSettingsActivity to be shown on System fragment via
xml/PreferenceController instead of category in the manifest.
Bug: 36891827
Test: make RunSettingsRoboTests
Change-Id: I61425fed4d63055c6c386be38792ae074aa72679
2017-04-27 22:33:52 +01:00
Fan Zhang
496fd0ca34
Merge pointer/tts categories into one without heading
...
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix: 35960300
Test: robotests
2017-04-27 13:47:44 -07:00
Sudheer Shanka
f64c5236c7
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
2017-04-27 20:46:16 +00:00
Maurice Lam
7415f0b420
Merge "Update notification suggestion icon"
2017-04-27 20:26:15 +00:00
Matthew Fritze
979aa9e1bb
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev am: b48e6e46b3
...
am: 6e4d02fa86
2017-04-27 20:01:56 +00:00
Matthew Fritze
6e4d02fa86
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
...
am: b48e6e46b3
2017-04-27 19:55:29 +00:00
TreeHugger Robot
b48e6e46b3
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
2017-04-27 19:50:31 +00:00
Maurice Lam
ddbbe46333
Fix Robolectric test on oc-dev. DO NOT MERGE am: 8352421baa
...
am: 9e7debc8a3
2017-04-27 19:44:39 +00:00
TreeHugger Robot
e6f080578f
Merge "Listen to brigtness updates to update brightness summary."
2017-04-27 19:38:43 +00:00
Matthew Fritze
2caaa7420d
Remove search duplicates for Wifi and Bluetooth
...
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
2017-04-27 12:36:16 -07:00
Maurice Lam
9e7debc8a3
Fix Robolectric test on oc-dev. DO NOT MERGE
...
am: 8352421baa
2017-04-27 19:34:08 +00:00
Maurice Lam
8352421baa
Fix Robolectric test on oc-dev. DO NOT MERGE
...
The directories for setup wizard lib renamed on master.
Test: cd tests/robotests && mma
Bug: 37745541
Change-Id: Iffb7aa85a41a1d84c17357144f964e1d6da693be
2017-04-27 12:01:57 -07:00
Meng Wang
586741cc15
Allow view/update EAB Provisioning status
...
Bug: 37433707
Test: make
Change-Id: I8cafe72015a9d80c3711b7cf472ae8fadcfd8170
2017-04-27 11:29:23 -07:00
Doris Ling
2e4ff90f5a
Listen to brigtness updates to update brightness summary.
...
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.
Change-Id: I611ec77174ab45315ccbee2952bdbc2c9a9cd954
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-27 10:52:31 -07:00
Ajay Panicker
8b2bc01d9e
Merge "Limit btsnoop file size (4/8)" am: 7baae2a924 am: 7469ff3e1c am: 2151ee9b86
...
am: 408bcef41a
2017-04-27 17:33:16 +00:00
Ajay Panicker
408bcef41a
Merge "Limit btsnoop file size (4/8)" am: 7baae2a924 am: 7469ff3e1c
...
am: 2151ee9b86
2017-04-27 17:18:50 +00:00
Ajay Panicker
2151ee9b86
Merge "Limit btsnoop file size (4/8)" am: 7baae2a924
...
am: 7469ff3e1c
2017-04-27 17:08:48 +00:00
Ajay Panicker
7469ff3e1c
Merge "Limit btsnoop file size (4/8)"
...
am: 7baae2a924
2017-04-27 17:06:18 +00:00
Philip P. Moltmann
144797ed1b
Merge "Don't show autofill settings if not enabled" into oc-dev am: 32d3d383cb
...
am: fc656da908
2017-04-27 17:02:38 +00:00
Treehugger Robot
7baae2a924
Merge "Limit btsnoop file size (4/8)"
2017-04-27 17:02:05 +00:00
Philip P. Moltmann
fc656da908
Merge "Don't show autofill settings if not enabled" into oc-dev
...
am: 32d3d383cb
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
4afa2f9ec3
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev am: 6e34174f72
...
am: 84c3702050
2017-04-27 16:42:40 +00:00
Pavel Grafov
84c3702050
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
...
am: 6e34174f72
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
Felipe Leme
61d6ec61aa
Check for permission when displaying AutofilLServices.
...
Bug: 35956220
Test: manual verification
Test: make RunSettingsRoboTests -j90
Change-Id: Ica0079650f17cf96d8c8a9b0849a82b02cfa8dc6
2017-04-27 08:53:48 -07:00
Julia Reynolds
c7ea0f961b
Merge "App & channel notification settings updates" into oc-dev am: 8e305ee536
...
am: afebbacc12
2017-04-27 15:30:57 +00:00
Julia Reynolds
afebbacc12
Merge "App & channel notification settings updates" into oc-dev
...
am: 8e305ee536
2017-04-27 15:24:02 +00:00
