Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bac679b0d4 Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321) 
Change-Id: I7fc627c79fe369e444ab411d109c439f796d67ff
 2014-10-24 11:29:12 -07: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
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
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption 
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
 2014-10-24 10:37:40 -07: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
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
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
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
 2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +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
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
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
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
Christoph Studer
81e5b5f2f8 NoMan: Log canceled notifications 
In addition to logging cancelation command, also log actually
canceled notifications via the new eventlog tag notification_canceled.

Bug: 18083122
Change-Id: I1e3e1e1368f39519f34c002ae374f318f647a401
 2014-10-24 16:34:54 +02:00
Christoph Studer
c10f39d536 am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 
* commit '5c1a49651b4e0a15a938560394bffeaeb5718f72':
  SysUI/NoMan: Log clicks on notification buttons
 2014-10-24 14:33:59 +00:00
Christoph Studer
5c1a49651b Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 2014-10-24 14:29:20 +00:00
Adrian Roos
e5c5b948c7 am e01f4e27: Merge "Set the right expanded state" into lmp-mr1-dev 
* commit 'e01f4e273803f4f971032261ea0a92ceeaa5a926':
  Set the right expanded state
 2014-10-24 14:24:11 +00:00
Adrian Roos
e01f4e2738 Merge "Set the right expanded state" into lmp-mr1-dev 2014-10-24 14:19:36 +00:00
Jason Monk
467f9efe89 am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 
* commit '104d2484ec605d9673e74cc125d92d41b6968327':
  Show screen pinning toasts on all users
 2014-10-24 14:00:25 +00:00
Jason Monk
4e904890c6 am ef255fce: Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev 
* commit 'ef255fce94e857a071ef6d0485e33d234fbad0f0':
  Fix talkback name of screen pinning button
 2014-10-24 14:00:21 +00:00
Jason Monk
104d2484ec Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 2014-10-24 13:55:55 +00:00
Jason Monk
ef255fce94 Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev 2014-10-24 13:54:58 +00:00
Adrian Roos
49d53452e7 Ensure trust agents are disabled in safe-mode 
Bug: 18070351
Change-Id: I71c5441bb501bb0996b557519328eb0847f043cf
 2014-10-24 15:48:39 +02:00
Adrian Roos
53f30ec270 am bcd07652: Add API for querying trusted state 
* commit 'bcd076525ccb8a3dfe7d1002bcae059661c1d111':
  Add API for querying trusted state
 2014-10-24 13:21:30 +00:00
Adrian Roos
2ace72544a SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState 
Bug: 18084166
Change-Id: I7d8695f4b576676cc6da1fe07fea05e72d04f33e
 2014-10-24 14:35:26 +02:00
Adrian Roos
bcd076525c Add API for querying trusted state 
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
 2014-10-24 13:59:45 +02:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Narayan Kamath
e572a77f05 am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev 
* commit 'fa36b36c8b66fc89f446a9eb065c31a1b224e662':
  Deprecate more apache-http.
 2014-10-24 09:13:22 +00:00
Narayan Kamath
2f3483939e am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev 
* commit '7eafd944cd5845001a0b2562f55685832d8023f3':
  Deprecate apache-http.
 2014-10-24 09:13:17 +00:00
Yuncheol Heo
ddb863f428 am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit '5b062e07c5a647d12cbeb9dace7806b54d459c56':
  CEC: Fix apilint errors.
 2014-10-24 09:13:14 +00:00
Neil Fuller
12260ad72c am 07ff2f72: Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 
* commit '07ff2f72c8ae14415d784ddeb3944c5a9b188a83':
  Deprecating FloatMath and Time
 2014-10-24 09:13:09 +00:00
Narayan Kamath
fa36b36c8b Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00