Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,836 Commits 3 Branches 0 Tags
25d39bc334e7e1e6be46d85d23aedbfb42eaf91f
Commit Graph

143836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
25d39bc334 am e1b81079: am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev 
* commit 'e1b810793924956eb5517cd4e2c57a721e8f750e':
  TIF: change onCreateSession() method signature
 2014-07-18 13:13:37 +00:00
Youngsang Cho
f5eb7e4870 am 860ba40c: am f6a118b2: am ad67fc6f: Fix a build breakage 
* commit '860ba40c471521489fc5d6f753f93045ed088618':
  Fix a build breakage
 2014-07-18 13:13:33 +00:00
Wonsik Kim
c27b371f3d am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev 
* commit '480dd588a0c67da50a671976fb643eb172d6fb11':
  TIF: change onCreateSession() method signature
 2014-07-18 11:45:01 +00:00
Youngsang Cho
977769e670 am f6a118b2: am ad67fc6f: Fix a build breakage 
* commit 'f6a118b28587adc300a5fb39d17b900e3c719504':
  Fix a build breakage
 2014-07-18 11:44:56 +00:00
Wonsik Kim
b1c978b724 am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev 
* commit '5fec7afe3b1bb24c9382ab59a25f5c7eb87e6344':
  TIF: change onCreateSession() method signature
 2014-07-18 11:22:02 +00:00
Youngsang Cho
10fe6bc6f7 am ad67fc6f: Fix a build breakage 
* commit 'ad67fc6fe2994c72bd31896de25dceb0adacd3cb':
  Fix a build breakage
 2014-07-18 11:21:53 +00:00
Youngsang Cho
3b0f928475 Fix a build breakage 
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
 2014-07-17 21:27:00 -07:00
Youngsang Cho
c941837cc1 am a2fb0d77: am 33b7885e: am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 
* commit 'a2fb0d77795c4129382fcf930f03a79bd0cf76c2':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
 2014-07-18 03:45:52 +00:00
Youngsang Cho
96cdc2327c am 38683808: am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 
* commit '38683808a6b14a1a26ebddcba60f2261ff997054':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
 2014-07-18 03:45:48 +00:00
Youngsang Cho
32e9d53123 am 9f4847e1: am 9dc7566a: am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 
* commit '9f4847e138f5b5fd641b20cf4fd98f2eabe12d3a':
  TIF: Add a notification for surface change from TvView to TvInputService
 2014-07-18 03:45:43 +00:00
Jae Seo
2bf0cf0207 am 326896be: am eb39352e: am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input 
* commit '326896be4943dc33965a13bd57eacf41b18ba11c':
  TIF: Add a method to get TvInputInfo for a given TV input
 2014-07-18 03:41:34 +00:00
John Spurlock
56577939be am 1a95b304: am be3417a0: am 5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev 
* commit '1a95b304677c1312260d7f129f5a5dc4c734be41':
  Volume: Rocker animation + style updates.
 2014-07-18 03:41:29 +00:00
Jae Seo
136a546099 am 0d9329d2: am e2ef18ce: am 27d12ca6: TIF: Add buildInputId() 
* commit '0d9329d24cf6c6f01576cf276bdd995f2f53eed4':
  TIF: Add buildInputId()
 2014-07-18 03:41:25 +00:00
Youngsang Cho
5f99ce1218 am 33b7885e: am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 
* commit '33b7885eef0d4657a8bf47e99031c366df2f69fe':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
 2014-07-18 03:40:10 +00:00
Youngsang Cho
686a8cfe7f am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 
* commit 'eede71e543a07c6874636ec50cff57c4c5f8f839':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
 2014-07-18 03:40:05 +00:00
Youngsang Cho
c13eacf40e am 9dc7566a: am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 
* commit '9dc7566a2c425144fc8ca33dc68df60c85c69337':
  TIF: Add a notification for surface change from TvView to TvInputService
 2014-07-18 03:39:59 +00:00
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
 2014-07-18 03:37:10 +00:00
Jae Seo
4d9ed9ccb9 am eb39352e: am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input 
* commit 'eb39352e64f10c086c69028b2adab259589add19':
  TIF: Add a method to get TvInputInfo for a given TV input
 2014-07-18 03:35:32 +00:00
John Spurlock
c7d87088d0 am be3417a0: am 5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev 
* commit 'be3417a019bdcb1c0b49fe51fed2960a14102ad4':
  Volume: Rocker animation + style updates.
 2014-07-18 03:35:28 +00:00
Jae Seo
c5c51af8db am e2ef18ce: am 27d12ca6: TIF: Add buildInputId() 
* commit 'e2ef18ce351e08becc100e2d76b6054a8d5ae96e':
  TIF: Add buildInputId()
 2014-07-18 03:35:24 +00:00
Youngsang Cho
49d4ba0707 am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 
* commit 'd81f1075c0aa5623a3fd64150e8ca5f6d04907c8':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
 2014-07-18 03:34:53 +00:00
Youngsang Cho
2f51324a86 am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 
* commit 'aa5dbe6370213b9c18e6f34d812c055645696f58':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
 2014-07-18 03:34:49 +00:00
Youngsang Cho
b2990d8d20 am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 
* commit '57df5b3db54f627345d8fe16c51fc3561f563f9e':
  TIF: Add a notification for surface change from TvView to TvInputService
 2014-07-18 03:34:45 +00:00
Jae Seo
353bdd484f am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
  TIF: Add TvParentalControlManager
 2014-07-18 03:30:41 +00:00
Jae Seo
94cdcaf7a1 am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input 
* commit 'cd12bfc7259cd7f38986f8a135764ab42d81e30a':
  TIF: Add a method to get TvInputInfo for a given TV input
 2014-07-18 03:30:31 +00:00
John Spurlock
ec181ef2e1 am 5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev 
* commit '5690da980040eb4b1a89ea903733f0cc8d247c5e':
  Volume: Rocker animation + style updates.
 2014-07-18 03:30:28 +00:00
Jae Seo
86617605ce am 27d12ca6: TIF: Add buildInputId() 
* commit '27d12ca6b4966d6dd520fb72fb0058619a87d448':
  TIF: Add buildInputId()
 2014-07-18 03:30:23 +00:00
Jae Seo
d2d179c3ca am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit '3245f3d76cc92899091f113e701a32a7eb819591':
  TIF: Add TvParentalControlManager
 2014-07-18 03:26:23 +00:00
Jae Seo
b375805f3b TIF: Add a method to get TvInputInfo for a given TV input 
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
 2014-07-17 20:25:01 -07:00
Jeff Brown
33003efada am 843b68d9: am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit '843b68d94d3a8d4ad1960c905ad41d5cec4d3ccb':
  Add glance sensor for doze mode.
 2014-07-18 03:24:03 +00:00
Jae Seo
5507bd7688 TIF: Add buildInputId() 
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.

Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
 2014-07-17 20:23:52 -07:00
Tyler Gunn
439a6f9644 am 612354c2: am 6edbc6ed: am 1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev 
* commit '612354c2967226daa41334faea060da61d7eb033':
  Wiring video state through from Connection
 2014-07-18 03:19:12 +00:00
Sandeep Siddhartha
cad6e7d925 am 0710c230: am 207c076a: am ad6bb11f: Merge "Test hotword flow" into lmp-dev 
* commit '0710c230cd47d6c4fba43f7de5dcf260411ea210':
  Test hotword flow
 2014-07-18 03:19:08 +00:00
Wonsik Kim
247723646d am 6bd44d47: am 719c0ebd: am 2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev 
* commit '6bd44d4707ec5fe737880f93164036e9a0e56d4d':
  TIF: one-to-many relationship for TvInputService to TvInputInfo
 2014-07-18 03:19:03 +00:00
RoboErik
f0fa1c2877 am 6b745791: am 5f604ccf: am 2ca51276: Fix crash when calling MediaSession callback 
* commit '6b7457917ab147c91d74a2c263374b5ae02139ef':
  Fix crash when calling MediaSession callback
 2014-07-18 03:18:59 +00:00
Marcin Kosiba
b04162ab75 am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
  Add a WebView.zoomBy API.
 2014-07-18 03:18:54 +00:00
Zhijun He
af62909542 am 484bc130: am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit '484bc13071781d9401b42043e3ffe277ae512ad3':
  Camera2: partialResultCount should be optional
 2014-07-18 03:18:50 +00:00
Jeff Brown
e048698b4b am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit '9560a0797de1ce25952c9e8a0b124f49f8cf102e':
  Add glance sensor for doze mode.
 2014-07-18 03:16:58 +00:00
Tyler Gunn
ae2d2bd98a am 6edbc6ed: am 1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev 
* commit '6edbc6edbfbec463efa2a364c1c8db32033b0765':
  Wiring video state through from Connection
 2014-07-18 03:09:55 +00:00
Sandeep Siddhartha
bf2321646f am 207c076a: am ad6bb11f: Merge "Test hotword flow" into lmp-dev 
* commit '207c076a52c74b28570ca6269e0b56bd8c886757':
  Test hotword flow
 2014-07-18 03:09:50 +00:00
Wonsik Kim
b0026ccd29 am 719c0ebd: am 2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev 
* commit '719c0ebdaceb1f714d66ff35c80cb3765f1caae9':
  TIF: one-to-many relationship for TvInputService to TvInputInfo
 2014-07-18 03:09:45 +00:00
RoboErik
a52026eb26 am 5f604ccf: am 2ca51276: Fix crash when calling MediaSession callback 
* commit '5f604ccf740919c294cad9403fd67c315eb20724':
  Fix crash when calling MediaSession callback
 2014-07-18 03:09:35 +00:00
Marcin Kosiba
64fcb8c3f9 am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
  Add a WebView.zoomBy API.
 2014-07-18 03:09:31 +00:00
Zhijun He
08da81b41b am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit 'fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
  Camera2: partialResultCount should be optional
 2014-07-18 03:09:25 +00:00
Jeff Brown
99aa4d3ec3 am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit 'ce75065cff02b83f153306c2c2ec7e1cc3ef262b':
  Add glance sensor for doze mode.
 2014-07-18 03:08:27 +00:00
Jinsuk Kim
3a96903be4 am 2fa30b74: am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev 
* commit '2fa30b74b14b07fa83c811da748cf66d48018c4c':
  Remove system audio output option for HdmiControlService
 2014-07-18 02:57:49 +00:00
Craig Stout
c37905b81f am 7a400e30: am 79de62b3: am 51ff3b68: Fix timepicker double done buttons. 
* commit '7a400e3086c33c3c90b188d3ec5e8690be78ce82':
  Fix timepicker double done buttons.
 2014-07-18 02:57:45 +00:00
Filip Gruszczynski
a051400fae am 41ba84e5: am c82b01a5: am 23c51de9: resolved conflicts for merge of bbc49941 to lmp-dev 
* commit '41ba84e5b6b763e1fe3fbc4fffa15ebf5aee074e':
  Only use bottom outset for main display.
 2014-07-18 02:57:40 +00:00
John Spurlock
51d6d9db64 am d412c14d: am b1bcf059: am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev 
* commit 'd412c14d12639d753fcfd7e93cf0a2769165e171':
  Shade: Hide status icons, take 2.
 2014-07-18 02:57:36 +00:00
Christopher Tate
aa19005245 am 2d3830be: am 85f64ae6: am 912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
* commit '2d3830be30a45c39c232f2b2e615a721b315babd':
  Properly end full restore attempt if getNextFullRestoreDataChunk() fails
 2014-07-18 02:57:32 +00:00