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

138718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
2e7a9167ae Adds listeners for changes to the list of active sessions 
The listeners get notified when sessions are added, removed, or
reprioritized.

Change-Id: I7f3bfc84049719c3b9c19016c6bac92e1a5c3179
 2014-06-08 12:21:32 -07:00
RoboErik
5d3114b64a b/15388389 Add volume handling support to MediaRouter 
This makes MediaRouter work with sessions to handle volume
requests. Should work with all existing custom volume handling.

Change-Id: I5dfde26a6203a1072b7fc700978b4ca852ebe7d0
 2014-06-08 12:18:25 -07:00
Paul Jensen
6d3ff9ea3a Apply API review to android.net.Network: 
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
 2014-06-08 12:09:18 -07:00
Bryan Mawhinney
2386bd5de4 Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev 2014-06-08 17:03:04 +00:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00
Jae Seo
1bfce9fb9b TIF: Address the feedback from the API review - 3/3 
- Change TvView to be a generic ViewGroup with a single SurfaceView child

Bug: 15345342
Change-Id: I86ed94b7020aabb6e093e391ab9477c1f801919a
 2014-06-08 21:42:39 +09:00
Dongwon Kang
336cdf20dd Make TvView keep the volume value and set later once the connecation is made. 
Bug: 15483740
Change-Id: Id4272bffb556587707b641ec8296bc5a9e57807e
 2014-06-08 18:20:55 +09:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
 2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file 
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
 2014-06-07 22:38:18 -07:00
Matthew Williams
13b0241248 Add test app for JobScheduler 
Schedule either a delay/deadline task, or a task with
connectivity constraints
Change-Id: Ie7ea731d0f6673b680cef79f894cb609a61b795d
 2014-06-07 20:50:54 -07:00
Deepanshu Gupta
acb119f0a2 Merge "Build LayoutLib with Java 6" into lmp-preview-dev 2014-06-07 23:32:10 +00:00
Sailesh Nepal
8b5dd8c5d4 Merge "API: Add call service handoff trigger" 2014-06-07 21:11:17 +00:00
Deepanshu Gupta
f4058c8d6b Build LayoutLib with Java 6 
Add source and target flags to LayoutLib Bridge to enable compatibility
with Java 6.

Change-Id: I81266af758bb57df037541d6e82600e5020a3c0d
 2014-06-07 11:19:03 -07:00
Dianne Hackborn
000cdd5fe5 Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev 2014-06-07 17:33:18 +00:00
Baligh Uddin
60c78f58ab am 7c12fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '7c12fff112cf0bd09022bf2e87f721fc4c8526f3':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:53 +00:00
Baligh Uddin
2c0b9cf758 am 0b8dd221: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '0b8dd221d213d876438d65d67641001f51cd494d':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:48 +00:00
Baligh Uddin
97892901cd am f7e5788e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'f7e5788e8598531998e5934ab700c42d8ba15aa4':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:44 +00:00
Igor Murashkin
09c0d2618c am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 
* commit 'f6c66902392ae7fcfd44fe90fc43b08b21db2e10':
  util: Make Rational a Number/Comparable; add Range#inRange
 2014-06-07 12:26:23 +00:00
Alan Viverette
bc0fbaebec am 8f04539e: (-s ours) Fix build 
* commit '8f04539ef2c88bdaf9c89bd14b7c23d30ad8ba09':
  Fix build
 2014-06-07 12:26:17 +00:00
Todd Poynor
c42ef37e28 am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev 
* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update
 2014-06-07 10:01:10 +00:00
Wonsik Kim
af743eeaec Make TvInputs aware of whether it's hardware-based or not 
Bug: 15326724
Change-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42
 2014-06-07 13:36:19 +09:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master 
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
 2014-06-06 21:13:28 -07:00
Baligh Uddin
069f94230d Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:55 +00:00
Baligh Uddin
48798325ed Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:51 +00:00
Baligh Uddin
ceb997bae0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:45 +00:00
Baligh Uddin
714ac2891c Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:42 +00:00
Baligh Uddin
7892a49615 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:36 +00:00
Baligh Uddin
d29b822d9b Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
c525c9605f Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
d5cf4a6ff6 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:23 +00:00
Baligh Uddin
e70fea28e6 Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:20 +00:00
Ari Sachter-Zeltzer
7e3357a56d [system transitions] 
+ merge all transition work into new branch for commiting to master
+ new task switching animations to support doc-centric recents
+ new default activity transitions
+ new app -> home (wallpaper close)
+ updated fragment close

Change-Id: If055e454e7e7bf11c7d54c8cacad8f7ec52d12d1
 2014-06-06 19:48:36 -07:00
Jeff Brown
b61eaaac59 Add @SystemApi annotation to internal permissions. 
This is a first pass at annotating permissions that should not be
granted or used by to third-party apps but that may be required by
privileged system applications.  For this patch, the annotation was
only added to permissions that have a protection level of at least
system.  Signature-only permissions were left alone since they only
need to be visible to built-in components.

Change-Id: I189472028274c133793ad8e4068585c536dd7f38
 2014-06-06 19:46:26 -07:00
Jeff Brown
eb490d6194 Add support for @SystemApi annotation to aapt. 
When aapt sees @SystemApi in the XML comment associated with a resource,
it will now remove this tag from the comment (since is it not meaningful as
a Javadoc tag) and instead add an @android.annotation.SystemApi annotation
to the declared type or member.  This enables easy downstream processing of
this annotation from generated code.

Change-Id: If984908477648c0c90be52fdc955fbb891d99b28
 2014-06-06 19:43:42 -07:00
Igor Murashkin
2f98a26bbf Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 2014-06-07 00:35:36 +00:00
Alan Viverette
e6a4613cf3 Fix build 
Change-Id: I49b6330e30710b99f9c89e2a88c95a8157a352ad
 2014-06-06 17:29:11 -07:00
Igor Murashkin
007bfb14d2 util: Make Rational a Number/Comparable; add Range#inRange 
* Also changes Rational to reduce the numerator/denominator by
its greatest common divisor at construction time (e.g. (2/4 -> 1/2)).

Bug: 15432042
Change-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d
 2014-06-06 16:38:09 -07:00
Todd Poynor
407a403402 Merge "BatteryManager: battery property query API update" into lmp-preview-dev 2014-06-06 23:16:16 +00:00
Craig Mautner
3c9f70dc86 Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev 2014-06-06 23:14:32 +00:00
Alan Viverette
dcdce7730b Merge "Material theme" 2014-06-06 22:49:21 +00:00
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Tim Murray
08d3775cbe am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
 2014-06-06 22:41:22 +00:00
Jeff Brown
a18d0acc1f Merge "Rename PrivateApi annotation to SystemApi." 2014-06-06 22:38:54 +00:00
Tim Murray
7fa0e6bc69 Merge "Change flags to use int instead of long." into lmp-preview-dev 2014-06-06 22:36:49 +00:00
Matt Casey
c4cbf54c29 Merge "Make MediaStore.Audio.Radio not instantiable" 2014-06-06 22:27:39 +00:00
Jeff Brown
d5a5b5a547 Rename PrivateApi annotation to SystemApi. 
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
 2014-06-06 15:16:27 -07:00
Alan Viverette
052027dc90 am 1c097b99: (-s ours) Merge "DO NOT MERGE Material theme" into lmp-preview-dev 
* commit '1c097b996e796b5d6b1f54c7c8119cf8407bcacc':
  DO NOT MERGE Material theme
  Current page not updated when closed
 2014-06-06 22:00:04 +00:00
Alan Viverette
1abd798db9 Merge "DO NOT MERGE Material theme" into lmp-preview-dev 2014-06-06 21:56:51 +00:00
svetoslavganov
9799686df0 Merge "Current page not updated when closed" into lmp-preview-dev 2014-06-06 21:46:18 +00:00