drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,560 Commits 1 Branch 0 Tags
Commit Graph

5415 Commits

Author SHA1 Message Date
Sandeep Siddhartha
9d9ef2e791 Merge "searchKeyphrase* should not be in the SDK" into lmp-dev 2014-07-23 18:56:15 +00:00
Sandeep Siddhartha
392981e172 searchKeyphrase* should not be in the SDK 
Bug: 16400889
Change-Id: Idedaefe378e330910301a8f0a88527376398d743
 2014-07-23 15:16:10 -07:00
Alan Viverette
35efc633d0 Merge "Revert "Make lighting style and attribute public"" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
4c31decf17 Revert "Make lighting style and attribute public" 
We're moving some things around. Stay tuned!

This reverts commit fe16224456b72966515190e19f8f85793a39d1c9.

Change-Id: I13a2013854cba64540dfee5c3e4ecb4929c336b5
 2014-07-24 01:43:51 +00:00
Alan Viverette
ad7e715f8b Make lighting style and attribute public 
BUG: 15859361
Change-Id: I8a12b820687c546d7441a06161da5928b2ac52fb
 2014-07-23 17:31:00 -07:00
Alan Viverette
1bc61376f5 Merge "Make lighting style and attribute public" into lmp-dev 2014-07-23 18:56:15 +00:00
Yao Chen
7e21fe8be9 various fixes in MediaBrowserItem and MediaBrowserService 
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
 2014-07-23 13:15:23 -07:00
Gabriel Peal
b8cb6518d8 Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* changes:
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change 
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
 2014-07-23 12:16:55 -07:00
Gabriel Peal
f364f94496 Added Action to PlaybackState 
Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
 2014-07-23 11:45:03 -07:00
Gabriel Peal
f0593bc17b Added QueueState, playUri, and playFromSearch. 
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
 2014-07-23 11:45:03 -07:00
Nancy Chen
2e02b9ea5c Merge "Hide multiple-account information if there is only a single account" into lmp-dev 2014-07-23 18:38:23 +00:00
Nancy Chen
6080118beb Hide multiple-account information if there is only a single account 
Adding an API method to telecomm to determine whether there is a single
account.

Bug: 16483795
Change-Id: If30d3a53458b4c784995f3f9e471c8163a8175a4
 2014-07-23 16:41:10 -07:00
RoboErik
627ec760b0 am 1edef222: am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '1edef22273242f5f08a45a064e8d197a6bd08892':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:26:47 +00:00
Sander Alewijnse
549d39e549 am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:18:27 +00:00
RoboErik
9db9bf7034 Switch Session APIs over to AudioAttributes 
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
 2014-07-23 17:08:32 +00:00
Chris Wren
73cc43da36 am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'f03ef334c4e91643ba834d136b489f28cfbaf117':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:32:35 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Santos Cordon
2189b75a05 am 5ec0bb4c: am 22900e4e: am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 
* commit '5ec0bb4c233998e6c4f39dd0a3c906d9a3d214ad':
  Change display Strings to CharSequence (1/3)
 2014-07-23 13:26:35 +00:00
Bryan Mawhinney
fbeaead282 am 3e90363e: am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '3e90363e815629318d65bb8e2b98b2b9efa9c882':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 13:26:18 +00:00
Bryan Mawhinney
e191f901d9 Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
So that they can be bridged appropriately by Android Wear

Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd
 2014-07-23 08:49:28 +00:00
Sander Alewijnse
0c1dcfd161 Merge "Add Device Policy API to disable screen capture." into lmp-dev 2014-07-23 05:48:23 +00:00
Sander Alewijnse
d2a1eec400 Add Device Policy API to disable screen capture. 
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
 2014-07-23 13:44:28 +00:00
Lajos Molnar
2ec9335c29 am 55a2e51e: am d9e091e0: am 3f52465c: MediaFormat: add KEY_TEMPORAL_LAYERING 
* commit '55a2e51e57310fb9bc0497047637d3ff48b36f46':
  MediaFormat: add KEY_TEMPORAL_LAYERING
 2014-07-23 03:51:44 +00:00
Lajos Molnar
4b902d72db MediaFormat: add KEY_TEMPORAL_LAYERING 
Bug: 14562236
Change-Id: I343d2859e48552d7372fec3b77aea868ff1bfc33
 2014-07-22 20:36:05 -07:00
Carlos Valdivia
889497e7f8 am 2d795ce2: am 8725abad: am 26680d5c: Merge "Allow authenticators to rename accounts." into lmp-dev 
* commit '2d795ce265eb5d47924d3a0b137b331bdfd9f4c6':
  Allow authenticators to rename accounts.
 2014-07-23 00:49:56 +00:00
Sandeep Siddhartha
b1cbd0f6f9 am df89ecd9: am 7573ba5f: am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev 
* commit 'df89ecd9de28431d4b9903a63b1ac8d1bc15bc9b':
  Make hotword availability a callback
 2014-07-23 00:41:09 +00:00
Yao Chen
ce548123ce am e35271bf: am 1b630ae7: am 5d35986f: Merge "Add thumbnail related api." into lmp-dev 
* commit 'e35271bf3d7eb67ab5426dcd66a546afadbc1ada':
  Add thumbnail related api.
 2014-07-23 00:21:30 +00:00
Andrew Lee
11af70a77d am fc50b246: am 327d6793: am 195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 
* commit 'fc50b2462d8a2573213891eaa5e8d5dba742a8dd':
  Don't throw RemoteException in public RemoteCallVideoClient APIs.
 2014-07-22 23:49:09 +00:00
Andrew Lee
4cadf2e181 am 4253251a: am aebbc98b: am 601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev 
* commit '4253251ad30fc03f87eacd46da85e7ff22ab4622':
  Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
 2014-07-22 22:55:00 +00:00
Andrew Lee
ef9364c306 am c3f7f312: am f0e8e160: am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 
* commit 'c3f7f31253f70e4f613b4349b8e649b4d7335427':
  Don't throw RemoteException in public RemoteCallVideoClient APIs.
 2014-07-22 22:20:04 +00:00
Santos Cordon
541a06e777 Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 2014-07-22 22:02:55 +00:00
Alan Viverette
7827184db9 am a0660d91: am 62e45ecb: am d6f1350f: Make toolbarStyle public 
* commit 'a0660d916799d4d06ca0f746682da9be493707df':
  Make toolbarStyle public
 2014-07-22 21:55:22 +00:00
Alan Viverette
10f6e97b26 am 11d6a547: am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '11d6a5470fb5315a294bc1f2c50bf4232382b58a':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:54:52 +00:00
Alex Klyubin
b4e042031c am 4c08680b: am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style. 
* commit '4c08680b4be0cfb70bcd9479f46ede59e1cd29e5':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:54:42 +00:00
Alan Viverette
b97326f067 Make toolbarStyle public 
BUG: 16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
 2014-07-22 14:05:46 -07:00
Sandeep Siddhartha
f63bc523ea Make hotword availability a callback 
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.

Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa

Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
 2014-07-22 17:11:52 -07:00
Alex Klyubin
fcd8b20e09 Align PSKKeyManager with framework API style. 
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
  implementations for all methods.

Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
 2014-07-22 19:51:34 +00:00
Andrew Lee
921ec8056a Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev 2014-07-22 16:29:55 +00:00
Andrew Lee
1995a6b58b Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs." 
This reverts commit 080b1f58eb877e1ac375768c6f951cc61a3cdbae.

Change-Id: I0dc963b3f4efe1479a7a94b8d851b89d15480d17
 2014-07-22 22:42:10 +00:00
Andrew Lee
a93e06bd64 Don't throw RemoteException in public RemoteCallVideoClient APIs. 
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.

Change-Id: Id666818b868c61f17b0701e4590d4e36f12c7b01
 2014-07-22 12:09:38 -07:00
Alan Viverette
cd73d1adda Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 2014-07-22 16:29:55 +00:00
Alan Viverette
22a117d1b6 Add popupTheme attr, propagate from ActionBar to ToolBar 
BUG: 16347549
Change-Id: I934ec2469f8c136f750e2e2cf9b333e229393ac3
 2014-07-22 19:34:30 +00:00
Carlos Valdivia
75111d83e6 Merge "Allow authenticators to rename accounts." into lmp-dev 2014-07-22 16:21:19 +00:00
Yao Chen
319f9a979c Add thumbnail related api. 
Change-Id: Ifcb06bbaf8f37df367f130124cbcef065fa25766
 2014-07-22 17:05:04 -07:00
Andrew Lee
8a57efb7eb Don't throw RemoteException in public RemoteCallVideoClient APIs. 
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.

Change-Id: Iaa049cab9e24120d3ea732e1ede78cc6fcd0ad71
 2014-07-22 15:47:56 -07:00
George Mount
ad88e1b1b2 API Council: Change docs and constant names. 
Bug 16401545

Changed doc for ChangeImageTransform.
Changed IN/OUT to MODE_IN/MODE_OUT.
Changed mode to flag attribute.
Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6
 2014-07-22 17:29:14 +00:00
Andrew Lee
8d7f8a253d Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 2014-07-22 16:13:36 +00:00
Santos Cordon
146a3e3665 Change display Strings to CharSequence (1/3) 
Bug: 16416927
Change-Id: Id8b6e5029a8a1f61bbbf71661abe4d487c01002a
 2014-07-22 03:29:34 +00:00
Carlos Valdivia
f193b9a61d Allow authenticators to rename accounts. 
Bug: 16390602

Change-Id: I4f7250726a2c7677e0ccaa6e5f995153893d8360
 2014-07-21 13:56:45 -07:00