12638 Commits

Author SHA1 Message Date
Mike Lockwood
ac4c704b4e am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev
* commit '383ce580b1c9e706d1b06a23d81986f3b4ed83fb':
  MidiManager: proxy all requests to open devices through MidiService
2015-06-08 19:51:26 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
John Spurlock
5e73a085c6 am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev
* commit '20ac61b8c0abd5af4ce32707e01cc1a501cbb7f0':
  Zen: New user flow for requesting DND access.
2015-06-08 16:51:59 +00:00
Mady Mellor
b4142e1c60 am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev
* commit 'e1f3214e72b63ed7cbe368005622055f80da0e0d':
  Change stylus button press to context click in View - API review feedback
2015-06-08 16:44:17 +00:00
Martijn Coenen
2812397fa6 am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev
* commit '6280481af6a7fb2631012a34b03b2d6b0d01eae5':
  Remove NFC CardEmulation dynamic resource APIs.
2015-06-08 16:42:46 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
Geoff Mendal
83b4172d03 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 16:32:40 +00:00
Geoff Mendal
29d825693a Import translations. DO NOT MERGE
Change-Id: I0a957f296d911b43158459c0a27e8b8cb1408a03
Auto-generated-cl: translation import
2015-06-08 09:17:26 -07:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access.
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
2015-06-08 11:53:35 -04:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Ruben Brunk
533514c9b5 am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '8f955f89c2ff19aac7f3e009c825beda3618f630':
  Add UI for camera + flashlight battery reporting.
2015-06-06 00:16:27 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Svetoslav
1edaf1bc57 am 772ca6cf: Merge "Update SMS permission description string" into mnc-dev
* commit '772ca6cf2a72f9cbf6e5dbe8693112638f3b5481':
  Update SMS permission description string
2015-06-05 23:59:56 +00:00
Svetoslav
772ca6cf2a Merge "Update SMS permission description string" into mnc-dev 2015-06-05 23:53:46 +00:00
Svetoslav
cfbca74bfa Update SMS permission description string
Change-Id: I777615113dbdcd0df1b5f4984ae18bfa57976ba3
2015-06-05 16:50:51 -07:00
Alan Viverette
7c3f250ebe am 4034e0ec: Merge "Fix inverse subhead color" into mnc-dev
* commit '4034e0ecc30f0c198e308cd6c7b7eb121b9f9c2b':
  Fix inverse subhead color
2015-06-05 17:39:38 +00:00
Alan Viverette
739b76b7e8 Fix inverse subhead color
Bug: 21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264
2015-06-05 10:26:03 -07:00
Mady Mellor
e860891b1a Change stylus button press to context click in View - API review feedback
Updates all references in View's onStylusButtonPress to onContextClick
as per API review feedback.

Additionally listens for mouse right clicks and calls the onContextClick
method for these as well for the stylus button press.

Bug: 21572278
Change-Id: I5c1ee8c8f23a77d7c677b86356e89d0e4fc40056
2015-06-05 09:02:55 -07:00
Martijn Coenen
a2344eac37 Remove NFC CardEmulation dynamic resource APIs.
No longer needed.

Bug: 21343778
Change-Id: I5188c4bc819146861d346f3f4339f002b7173027
2015-06-05 10:45:50 +02:00
Mike Lockwood
e0a6ca64fa MidiManager: proxy all requests to open devices through MidiService
Previously when a MidiManager client opened a virtual or Bluetooth device,
the client bound directly to the virtual device's MidiDeviceService
or BluetoothMidiDevice's IMidiDeviceServer for the given BluetoothDevice.
Only USB devices were opened in MidiService.

Now opening any type of MIDI device is done via IMidiManager.openDevice() or
IMidiManager.openBluetoothDevice().  MidiService tracks all connnections between
clients and devices.

Services that implement virtual devices must now require android.permission.BIND_MIDI_DEVICE_SERVICE
so only MidiService can bind to these services.

Bug: 21044677

Change-Id: I7172f7b1e0cbfe4a2a87dff376c32dc9b41aa563
2015-06-04 19:16:23 -07:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting.
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
2015-06-04 16:41:11 -07:00
Alan Viverette
ccb342c425 am d3c9df1a: Merge "Update number picker styling for Material" into mnc-dev
* commit 'd3c9df1a34ec41a8ab6c13911d0887a37170d0cc':
  Update number picker styling for Material
2015-06-03 23:44:09 +00:00
Alan Viverette
d3c9df1a34 Merge "Update number picker styling for Material" into mnc-dev 2015-06-03 23:35:02 +00:00
Geoff Mendal
0771d9296d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 19:47:36 +00:00
Geoff Mendal
dfd2ffb970 Import translations. DO NOT MERGE
Change-Id: I8ad8251f4d867e6f2a64782541d7afba1b2bf4a7
Auto-generated-cl: translation import
2015-06-03 12:41:03 -07:00
Vinit Deshpande
e49d01876f am e56782c0: Merge "make WiFi No Network Periodic Scans Interval to 5 minutes" into mnc-dev
* commit 'e56782c0f4f27c34a5959bee0cfbf00bcfdf0da9':
  make WiFi No Network Periodic Scans Interval to 5 minutes
2015-06-03 19:30:23 +00:00
Vinit Deshpande
e56782c0f4 Merge "make WiFi No Network Periodic Scans Interval to 5 minutes" into mnc-dev 2015-06-03 19:27:12 +00:00
Pierre Vandwalle
c6de03b0cd make WiFi No Network Periodic Scans Interval to 5 minutes
Bug:21274132

Change-Id: I751319e82deca1e40a3926fd210dd71a55a785f7
(cherry picked from commit 5fcff4ed7db9f0897d8fdae78c05cbdefe258455)
2015-06-03 12:05:46 -07:00
Arunesh Mishra
095b9b5b3a am 310fe5af: Merge "Use config.xml parameters instead of System properties." into mnc-dev
* commit '310fe5af672891870dc072965ce8ce2178172003':
  Use config.xml parameters instead of System properties.
2015-06-03 18:12:34 +00:00
Abodunrinwa Toki
4487b1186d am 87e949c4: Merge "More FloatingToolbar styles." into mnc-dev
* commit '87e949c4b836adb7856ca73a585aceaabe79a05f':
  More FloatingToolbar styles.
2015-06-03 17:42:12 +00:00
Xiaohui Chen
c8c29c4410 am 4913211d: Merge "usb debugging: show alert to secondary user" into mnc-dev
* commit '4913211dbe9f6dbbab75788976465eb2e4c46cd7':
  usb debugging: show alert to secondary user
2015-06-03 17:41:43 +00:00
Arunesh Mishra
310fe5af67 Merge "Use config.xml parameters instead of System properties." into mnc-dev 2015-06-03 17:13:55 +00:00
Abodunrinwa Toki
87e949c4b8 Merge "More FloatingToolbar styles." into mnc-dev 2015-06-03 16:54:38 +00:00
Xiaohui Chen
4913211dbe Merge "usb debugging: show alert to secondary user" into mnc-dev 2015-06-03 16:35:09 +00:00
Xiaohui Chen
ffcfe3411f usb debugging: show alert to secondary user
Bug: 12785423
Change-Id: If7f60899cfdaca7bdad560bd59a78f5be74c24be
2015-06-03 09:32:19 -07:00
John Spurlock
cc681b819b am e7f68c18: Merge "Volume footer uglification." into mnc-dev
* commit 'e7f68c18bf1a1da5d0aa129674fe4f9ecf06ac8c':
  Volume footer uglification.
2015-06-03 13:29:41 +00:00
John Spurlock
e7f68c18bf Merge "Volume footer uglification." into mnc-dev 2015-06-03 13:24:44 +00:00
Vinit Deshpande
18611fbff8 am f0742bdf: Merge changes from topic \'mwd-merge-wifi-0602015\' into mnc-dev
* commit 'f0742bdf0665810cc64d22c0c275bc8c8b7463f0':
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
2015-06-03 05:21:02 +00:00
Vinit Deshpande
f0742bdf06 Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev
* changes:
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
2015-06-03 05:09:32 +00:00
Geoff Mendal
ec07df075e Import translations. DO NOT MERGE
Change-Id: Iac607a9db94c1949d364ae78a584285bc0882194
Auto-generated-cl: translation import
2015-06-02 17:01:40 -07:00
Alan Viverette
d281428abd Update number picker styling for Material
Implements several missing drawable maintenance methods (state, etc.)
for NumberPicker's divider.

Bug: 21588885
Change-Id: Ibe37884354864c43fbf84d9eb79d7183af46fcad
2015-06-02 15:47:37 -07:00
Arunesh Mishra
6e4fb34e27 Use config.xml parameters instead of System properties.
For 'near-ultrasound' support (mic/speaker). Refer b/21072209
for details.

Bug: 21072209
Change-Id: Id7131cd38288d74af8102487b2c6b03048b4ae3b
2015-06-02 15:13:17 -07:00
John Spurlock
023544f762 Volume footer uglification.
- Move "End now" button to its own line, below the condition lines.
 - Add the feature name "Do Not Disturb" to the condition summary
   for the indef condition.
 - Fix found RTL issues with the footer.

Bug: 21171893
Change-Id: Ia12fe57d46a5547beec82cf76e175982bfa3fd6c
2015-06-02 17:56:28 -04:00
Amith Yamasani
52f26b6399 am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
* commit 'ff3b76d04672d09214cd0ceb29ec548c8abb2330':
  Temporarily whitelist an app for network during doze
2015-06-02 20:49:57 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Pierre Vandwalle
8944741c4f keep hal based pno disabled by default
Change-Id: Ia0de13fa127877a6bfd8b46b5a8b940b1faa7f3d
(cherry picked from commit e447fcd445f339f12d81dafa98a3b8d8a6a1ae7e)
2015-06-02 13:31:48 -07:00
Pierre Vandwalle
d07695ad94 enable SSID whitelist
Change-Id: Ic95a0ecd1d7ad7ae2a0f6232b2e8688fdb41dcc2
(cherry picked from commit 4f7606eb88ffcaa264aeb29241c59c403a879f25)
2015-06-02 13:31:15 -07:00
Adrian Roos
25d36c66f4 am 3546c61b: Remove obsolete symbols
* commit '3546c61b27eee218fc37581a3e0229b8646eb119':
  Remove obsolete symbols
2015-06-02 20:08:43 +00:00
Adrian Roos
3546c61b27 Remove obsolete symbols
Change-Id: I8e95e82ef4f954376c57685df80184416d579fe5
2015-06-02 19:56:11 +00:00