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

8792 Commits

Author SHA1 Message Date
RoboErik
5652066479 am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit '5728c18ac5a248bab36f7fefbf89c12ec0284fbb':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:57:16 +00:00
Tyler Gunn
320c2af96b am 18c6fe95: am 1cfc6db2: am 1207f7a7: Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 
* commit '18c6fe953fb24414bb2b327a4d36f8e6bfebe2b4':
  Hiding videoState values in telecomm APIs. (1/3)
 2014-09-02 17:34:21 +00:00
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +00:00
dcashman
a3fc37688e am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '81e038162935b00ccb2f6c76be4c3f633a8a1cb5':
  Address KeySet API Review
 2014-09-02 07:11:27 +00:00
Dianne Hackborn
9ab7f26183 am abb2e104: am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit 'abb2e104319552d2fd98d94fbd089f9ebdbbfe2d':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-09-02 07:10:51 +00:00
Sailesh Nepal
be7bc2233c am b71c4db7: am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit 'b71c4db73f4e5b90c0dd4664d5178a0602cc0557':
  Make PhoneAccount.Builder constructor public
 2014-09-01 11:25:28 +00:00
George Mount
6ee1c7c5d5 am e5e085e4: am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit 'e5e085e4c097fc6546aa39ed3d62f439211a5b1b':
  Add IDs for status and nav-bar backgrounds.
 2014-09-01 11:25:22 +00:00
Adam Lesinski
a5b221254e am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '0d7dd79b8acb2ad37c004d73de4a8c8455b38427':
  Make UsageStats API comply with API Council
 2014-09-01 11:25:17 +00:00
Tyler Gunn
b730542b75 Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 2014-08-30 06:26:04 +00:00
dcashman
efb1f36f09 Merge "Address KeySet API Review" into lmp-dev 2014-08-29 23:06:50 +00:00
Dianne Hackborn
2c3530061f Oh sticky broadcasts, I'd like to do even worse to you. 
Change-Id: I36a7eae294d325d1bd88c15d52566dd4ee1f35be
 2014-08-29 15:27:11 -07:00
RoboErik
c692d05951 Update MediaBrowser to use String ids instead of Uris 
Since we converted MediaDescription over to using a String media id
for identifying everything we should also use Strings in the browser
service to make it clear that it should re-use that field.

bug:17333205
Change-Id: I5fd5762bdad05068f5b1aa36074306b43432e686
 2014-08-29 15:16:19 -07:00
Tyler Gunn
be74de0978 Hiding videoState values in telecomm APIs. (1/3) 
Hiding in Connection, ConnectionRequest, and ConnectionService.
Also @hiding PhoneAccount and PhoneCapabilities attributes related
to VT.

Bug: 17243002
Change-Id: I685305cddb99e1d2eb767982106253894a8d282f
 2014-08-29 14:51:48 -07:00
Sailesh Nepal
8fd8124911 Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 2014-08-29 20:01:59 +00:00
George Mount
d2334e669c Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 2014-08-29 19:59:59 +00:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council 
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
 2014-08-29 12:52:41 -07:00
Nancy Chen
230780626f am 3d26fdff: am 67e97c84: am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '3d26fdff928234d76b27248969cebf715921f1ec':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 19:16:06 +00:00
Lorenzo Colitti
99dbe39234 am 96ec882b: am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '96ec882ba17f542b42b1da453325b8dba9ce67f2':
  Really remove NetworkBoundURLFactory.
 2014-08-29 19:15:49 +00:00
Sandeep Siddhartha
7f31f82432 am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev 
* commit '601d017c2209f0a7930503a0bc97b4e762e4e8a1':
  Address API review comments
 2014-08-29 19:14:33 +00:00
Adam Powell
0372031382 am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 
* commit '7faa69ced32f3f3ce0f8ec3143f6d90d24b0dfc3':
  Add xml attributes to Toolbar for navigation icon
 2014-08-29 19:14:06 +00:00
Nancy Chen
551056ec0f Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 2014-08-29 17:14:54 +00:00
Lorenzo Colitti
e37679b27d Merge "Really remove NetworkBoundURLFactory." into lmp-dev 2014-08-29 16:54:20 +00:00
Sailesh Nepal
38f480993f Make PhoneAccount.Builder constructor public 
Bug: 17321110

Change-Id: I61209f70c4719bbc77a310310c456b253032bedc
 2014-08-29 09:04:28 -07:00
George Mount
0fb81090c0 Add IDs for status and nav-bar backgrounds. 
Bug 17299689

Change-Id: I9b2168c547fe2670900614805031c3bb5fa63802
 2014-08-29 08:40:10 -07:00
Sandeep Siddhartha
503a102143 Merge "Address API review comments" into lmp-dev 2014-08-29 06:22:08 +00:00
Adam Powell
0c1dc53e74 Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 2014-08-29 02:25:49 +00:00
Lorenzo Colitti
32e520ed61 Really remove NetworkBoundURLFactory. 
The code using it was removed, but the file itself was not.

Bug: 17112978
Change-Id: I35bc254fd3a5e7b19297b959c7310e7054ab77e1
 2014-08-28 18:31:18 -07:00
Adam Powell
7c13bc2a70 Add xml attributes to Toolbar for navigation icon 
...to match the existing setters/getters.

Change-Id: I9814c5d7f2aa0559c93fbb74881e29064473f186
 2014-08-28 18:19:59 -07:00
Nancy Chen
da227c7fdd Hide AIDL for RemoteServiceCallback in telecomm 
Hide raw AIDL for public API

Bug: 17320748
Change-Id: I79926f9a527e8916b235186559c01cf00ded2f12
 2014-08-28 17:30:23 -07:00
Jean-Michel Trivi
12542f1757 am b49dfbef: am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'b49dfbef478aeaf1f88056fe14a85970a9580f2d':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 23:08:36 +00:00
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 23:08:20 +00:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback 
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
 2014-08-28 21:11:22 +00:00
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Christoph Studer
23867c4303 am df5eb412: am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'df5eb41241872e641a199b7089894dac5c9c358c':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:32:39 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Alan Viverette
3e53d52a9f am 6ddb2467: am 8a319757: am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 
* commit '6ddb2467b46a1c32a738a2082800cc9c19e9c053':
  Rename StatusBar.Material styles to Material.Notification
 2014-08-28 18:43:29 +00:00
Jose Lima
b420cd132a am 639df5f0: am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '639df5f03738f244d1d1ef10f099e5784ee1b3e8':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:30:34 +00:00
Alan Viverette
b712458362 Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 2014-08-28 18:13:21 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
Jeff Sharkey
d380f5604f am bc55cead: am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'bc55cead16c51a846c3fc1c8afd2aaf3d02e0b25':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:47:39 +00:00
Jeff Sharkey
ca5186e9d5 Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 2014-08-28 16:12:47 +00:00
Lajos Molnar
c5f688bb3f am 0b307ba1: am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 
* commit '0b307ba11f5a6aaf3ab16f0c4bcdcc55106b786d':
  media: update MediaCodec/Info/List/Format APIs based on review comments
 2014-08-28 14:01:46 +00:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 11:01:36 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00