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

164241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
f135073fdd Merge "Recent directories can\'t show file size." into lmp-mr1-dev automerge: 379551e 
automerge: 043f8dd

* commit '043f8dd27459f98537d46db77d482215b66c0ba0':
  Recent directories can't show file size.
 2014-10-24 21:26:09 +00:00
Tim Kilbourn
a9aecc0c29 Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 
automerge: 181c18e

* commit '181c18efd438f7a5e8cc18327367c49bf51795be':
  aapt updates for Android TV
 2014-10-24 21:24:59 +00:00
Jeff Sharkey
043f8dd274 Merge "Recent directories can\'t show file size." into lmp-mr1-dev 
automerge: 379551e

* commit '379551ebd54947cdff5600af52940f9c283aac1f':
  Recent directories can't show file size.
 2014-10-24 20:44:53 +00:00
Tim Kilbourn
181c18efd4 Merge "aapt updates for Android TV" into lmp-mr1-dev 
automerge: 6af7d76

* commit '6af7d76eff60220c5ab3678d8d1fb74ede242ace':
  aapt updates for Android TV
 2014-10-24 20:43:15 +00:00
Jeff Sharkey
379551ebd5 Merge "Recent directories can't show file size." into lmp-mr1-dev 2014-10-24 20:29:59 +00:00
Tim Kilbourn
6af7d76eff Merge "aapt updates for Android TV" into lmp-mr1-dev 2014-10-24 20:13:43 +00:00
Jeff Sharkey
0166ddf5bb Recent directories can't show file size. 
Don't show the toggle to the user, which can avoid crashing.

Bug: 17942524
Change-Id: Iaedd61b7c69e14b57508cb9865d1e0124ca2e505
 2014-10-24 13:06:32 -07:00
Tim Kilbourn
d9b1cad71e aapt updates for Android TV 
- Output whether an app claims to be a game (android:isGame)
- Output android:banner if it is specified at the application level.

Change-Id: I7118b524f62cdfc4effeef21b32b3cdd814d9bfa
 2014-10-24 12:59:24 -07:00
Winson Chung
14dd733073 am 00f65038: am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 
* commit '00f65038bbbfd0227bb544040e0f06038016a7b4':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
 2014-10-24 18:44:22 +00:00
Winson Chung
00f65038bb am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 
* commit '272b0a1d6acdb7c4d244a498f3769e20c35f43d1':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
 2014-10-24 18:39:28 +00:00
Winson Chung
7f8d8cc6a2 am e60abbd8: am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 
* commit 'e60abbd8f2e8d54f0a04944c11f2f752f8a206e2':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
 2014-10-24 18:34:47 +00:00
Winson Chung
b645ac5fc4 am 788dd73c: am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 
* commit '788dd73c9e96f77370f8a787d3c25c8ff741de64':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
 2014-10-24 18:34:36 +00:00
Jae Seo
1c8317a539 am 39b15017: am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev 
* commit '39b150173ae3a2b6950553450648d5bb223542e3':
  TIF: Notify of size change of the video in TvView
 2014-10-24 18:34:30 +00:00
Winson Chung
272b0a1d6a Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 2014-10-24 18:32:02 +00:00
Winson Chung
e60abbd8f2 am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 
* commit '623484d231436ee209089adaa6b88b68f0ebf534':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
 2014-10-24 18:30:38 +00:00
Winson Chung
788dd73c9e am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 
* commit '6697322af724d44ee59259d4f5563b07c24f62b4':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
 2014-10-24 18:30:33 +00:00
Jae Seo
39b150173a am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev 
* commit 'f98fe42f65ff90ae7e3f4c21757827604d374510':
  TIF: Notify of size change of the video in TvView
 2014-10-24 18:30:28 +00:00
Winson Chung
623484d231 Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 2014-10-24 18:25:10 +00:00
Winson Chung
6697322af7 Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 2014-10-24 18:24:54 +00:00
Jae Seo
f98fe42f65 Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev 2014-10-24 18:23:17 +00:00
Jeff Sharkey
b144b5f125 am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev 
* commit 'e92bd4c04bcb0d18c0fdae9246f4af06a5aba345':
  Allow I/O when installing providers.
 2014-10-24 17:48:22 +00:00
Jeff Sharkey
e92bd4c04b am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev 
* commit '2d87ba630cdcb6695582c655e6fc091115ffea38':
  Allow I/O when installing providers.
 2014-10-24 17:42:53 +00:00
Jeff Sharkey
2d87ba630c Merge "Allow I/O when installing providers." into lmp-mr1-dev 2014-10-24 17:40:30 +00:00
Jae Seo
6320fc490f TIF: Notify of size change of the video in TvView 
Put the necessary plumbing in place to notify of size change of the
video in TvView.
Put together the track related logic in TvInputManager.Session.
Protected track information with a lock.

Also modified debugging messages more consistently and fixed minor
warnings in TvView.

Bug: 17635300
Change-Id: I8d267d8a11056b5ccee1dacbf2d3391be16f811e
 2014-10-24 10:19:08 -07:00
Jae Seo
638cde9228 am 0fcddd51: am e41d967c: Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 
* commit '0fcddd513868918215e889db07cdca126f942d89':
  TIF: Cache the app private command and send it when connection is made
 2014-10-24 17:14:23 +00:00
Jae Seo
0fcddd5138 am e41d967c: Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 
* commit 'e41d967c5c6ff42ea41f61c731d77aa687b3956f':
  TIF: Cache the app private command and send it when connection is made
 2014-10-24 17:06:24 +00:00
Jae Seo
e41d967c5c Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 2014-10-24 17:02:34 +00:00
Jae Seo
887f52144e TIF: Cache the app private command and send it when connection is made 
Bug: 17559793
Change-Id: If785d1ffceb5b5152381818efc4d1c8b5115143c
 2014-10-24 10:01:06 -07:00
Svet Ganov
026e959d11 am 0abcda59: am fdef09ec: Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 
* commit '0abcda5929aac1746219c87dbdd26c33d990f3c6':
  Sometimes historical printers not properly ordered.
 2014-10-24 16:52:44 +00:00
Selim Cinek
edac8c895a am 31e307e6: am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 
* commit '31e307e6009c6461c8abc06a25d1be834e11d2a5':
  Cleaned up status bar closing handling
 2014-10-24 16:52:39 +00:00
Svet Ganov
0abcda5929 am fdef09ec: Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 
* commit 'fdef09ecef877605f47cc763eb497364f27e5c45':
  Sometimes historical printers not properly ordered.
 2014-10-24 16:48:26 +00:00
Selim Cinek
31e307e600 am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 
* commit '1b459f89a738fa913ed12fe893e435b2f6cc9416':
  Cleaned up status bar closing handling
 2014-10-24 16:48:21 +00:00
Svet Ganov
fdef09ecef Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 2014-10-24 16:42:18 +00:00
Selim Cinek
1b459f89a7 Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 2014-10-24 16:41:19 +00:00
Selim Cinek
dbbcfbe8ae Cleaned up status bar closing handling 
This could lead to a bug where there was a hole in the shade.

Bug: 17961295
Change-Id: Ief4bb3f79433a062c4904329e7ca130987d7fe0f
 2014-10-24 17:52:35 +02:00
Christoph Studer
438238eefa am 629a9a0b: am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 
* commit '629a9a0b392026169287fde5d168593fa228ec55':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
 2014-10-24 15:26:03 +00:00
Jason Monk
b22d1002d1 am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev 
* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better
 2014-10-24 15:20:55 +00:00
Christoph Studer
629a9a0b39 am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 
* commit '6709fba99e76480ae2728a7832c0c9796a11658a':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
 2014-10-24 15:20:40 +00:00
Jason Monk
730409c332 am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev 
* commit '013d14f887a8b317d60bd65fa3d3bbb215095cb4':
  Make lock task check if focused better
 2014-10-24 15:16:23 +00:00
Christoph Studer
6709fba99e Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 2014-10-24 15:15:03 +00:00
Jason Monk
013d14f887 Merge "Make lock task check if focused better" into lmp-mr1-dev 2014-10-24 15:09:39 +00:00
Selim Cinek
1aa2876c37 am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 
* commit '962c5ab8490c268ec55feff98466fab654116ea1':
  Fixed a bug where the indication text could get too high
 2014-10-24 15:08:22 +00:00
Christoph Studer
c4f03e9fcf am 8b417054: am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev 
* commit '8b4170547ee118b0b7f8fae2cbba1b799f91d2b4':
  NoMan: Log canceled notifications
 2014-10-24 15:03:13 +00:00
Selim Cinek
962c5ab849 am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 
* commit '2985dd763b21c63f54ef3d5f26cae249480ea05a':
  Fixed a bug where the indication text could get too high
 2014-10-24 15:03:06 +00:00
Christoph Studer
8b4170547e am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev 
* commit '55abbfa0ed92a742506175ab50e983a80a9bdabe':
  NoMan: Log canceled notifications
 2014-10-24 14:58:53 +00:00
Selim Cinek
2985dd763b Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 2014-10-24 14:57:01 +00:00
Christoph Studer
55abbfa0ed Merge "NoMan: Log canceled notifications" into lmp-mr1-dev 2014-10-24 14:53:37 +00:00
Tyler Gunn
c89c7be438 am 43ac9389: am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 
* commit '43ac9389bb7f19078e4d1ecd2d87bde3262ad6be':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
 2014-10-24 14:53:16 +00:00
Tyler Gunn
43ac9389bb am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 
* commit '3682ced751ee86f87a0af84a17f027e134c2f23e':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
 2014-10-24 14:47:45 +00:00
Tyler Gunn
3682ced751 Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 2014-10-24 14:41:14 +00:00