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

7928 Commits

Author SHA1 Message Date
Ji-Hwan Lee
162d6999e3 jpeg_bench: Fix checkbuild 
Change-Id: I73d82ffc022be4fc78ff0d8b62ab541dd896df24
 2014-06-13 20:16:15 +09:00
Jae Seo
796691e302 Merge "Add an API to get TV input icon" 2014-06-12 03:30:50 +00:00
Jaewan Kim
cca74c1b0d Add an API to get TV input icon 
Bug: 14423022
Change-Id: I7b3c0efadc8448cae56ef370611be8e09a301f42
 2014-06-12 10:36:00 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
 2014-06-12 18:49:02 +00:00
RoboErik
73e23e229d b/15330955 Make RemoteController use the new session APIs 
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
 2014-06-11 10:58:52 -07:00
Jae Seo
3a0f19980d Add channel types for NTSC, PAL and SECAM 
Bug: 14451655, Bug: 15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
 2014-06-11 18:25:11 -07:00
Elliott Hughes
f4c6a154e9 am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit 'b952587184572070805243e6f8380ceb769f441c':
  Switch to a type-safe album art interface.
 2014-06-12 00:15:38 +00:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
 2014-06-12 00:06:20 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface. 
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
 2014-06-11 14:43:57 -07:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants 
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
 2014-06-10 22:16:41 +00:00
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID 
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
 2014-06-10 12:44:04 -07:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
 2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153 am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
  b/15388389 Add volume handling support to MediaRouter
 2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
 2014-06-09 19:29:48 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81 Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 2014-06-09 19:07:34 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev 
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
 2014-06-09 17:44:37 +00:00
Elliott Hughes
f928103269 am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:37:31 +00:00
Elliott Hughes
ef00c16d62 am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:33:39 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00
Dongwon Kang
0a5b778495 am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev 
* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
  Make TvView keep the volume value and set later once the connecation is made.
 2014-06-09 15:55:56 +00:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
RoboErik
fb442b0384 Add a way to get the package/pid of the session 
We need a package/pid to connect a session to a notification. This
adds a way to get those from the controller of a session.

Change-Id: I7700a341beebd46116dfb7dc82f1a667c718e728
 2014-06-08 13:20:43 -07:00
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
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
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
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
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
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
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
 2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
 2014-06-06 12:36:13 +00:00
Dongwon Kang
7012db741c Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 2014-06-06 06:59:17 +00:00
Dongwon Kang
2750d21d8b Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 2014-06-06 06:58:02 +00:00
Jae Seo
b8a64416e5 TIF: Address the feedback from the API review - 2/3 
This change addresses the following comments from the council:
- Change the TvView API to be tune(String inputId, Uri channelUri) and
  reset()
- @hide TvInputSession class, including createSession() and
  SessionCallback
- Define a listener interface specific to TvView, allowing you to hide
  the session details and keep the API simpler.  Add
  setTvInputListener().

Bug: 15345342
Change-Id: I931662841b41d862ebc4a700ccb245889a5f87a5
 2014-06-06 09:13:28 +09:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
 2014-06-05 22:23:11 +00:00
Ji-Hwan Lee
cc15afbe12 Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 2014-06-05 22:12:08 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
 2014-06-05 21:00:32 +00:00
Alan Viverette
4586b0da63 Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 2014-06-05 20:37:22 +00:00
Ji-Hwan Lee
4c1959cc45 TvContract: Add channel logo and program thumbnail 
Channel logo is exposed via its own content URI,
"content://android.media.tv/channel/#/logo".

Program thumbnail is added as an URI column in existing program table.

Change-Id: I8dd636bbea9d3fa991ad42ccc03a198e8c1d051d
 2014-06-06 05:12:12 +09:00