Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,218 Commits 3 Branches 0 Tags
6fefb49f267eb7bfb8a074e8ff28e98a8a9571bc
Commit Graph

156218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuncheol Heo
6fefb49f26 am ccfbc040: am 41f887c4: Merge "Remove MHL related code." into lmp-dev 
* commit 'ccfbc0404e5c1677eee7d2d4cec0bae4fba66d4d':
  Remove MHL related code.
 2014-09-17 02:00:34 +00:00
mike dooley
a281155de0 am 2ee2ef10: am c7932a06: Merge "Fix a small printf format bug." into lmp-dev 
* commit '2ee2ef106791719286050e4eafe9ba339f19bc86':
  Fix a small printf format bug.
 2014-09-17 02:00:26 +00:00
Yuncheol Heo
8ac35890fe am 41f887c4: Merge "Remove MHL related code." into lmp-dev 
* commit '41f887c4620cb33041b2844314770c56605d2679':
  Remove MHL related code.
 2014-09-17 01:36:27 +00:00
mike dooley
c38e080692 am c7932a06: Merge "Fix a small printf format bug." into lmp-dev 
* commit 'c7932a06f76db95a44163d1feb68dcc8af411627':
  Fix a small printf format bug.
 2014-09-17 01:36:21 +00:00
Yuncheol Heo
afd6f342ad Merge "Remove MHL related code." into lmp-dev 2014-09-17 01:28:26 +00:00
mike dooley
9891bbeae2 Merge "Fix a small printf format bug." into lmp-dev 2014-09-17 01:25:14 +00:00
Yuncheol Heo
da6e9f10d0 Remove MHL related code. 
Bug: 17479050
Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
 2014-09-17 10:15:40 +09:00
mike dooley
f34519b4dd Fix a small printf format bug. 
Bug: 17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
 2014-09-16 18:14:14 -07:00
Dianne Hackborn
f13f4735ca am 8ee35cd4: am 3061d2b9: Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev 
* commit '8ee35cd4cd4242e30f6b989dd4746166fbe58dcc':
  Fix issue #17507017: took ~3 seconds to move an app to the foreground
 2014-09-17 00:37:31 +00:00
Dianne Hackborn
877f2b86cf am af9e070e: am 1a7cb969: Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 
* commit 'af9e070e0b0940de568fe19d65fe19b3a22cfb1e':
  Fix issue #16662560: SingleTop activity is getting instantiated multiple time
 2014-09-17 00:37:26 +00:00
Robert Greenwalt
a70efa5036 am 8fcbaddd: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit '8fcbaddd331b2b87698bc61c3bef0cdf439c31da':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:23:08 +00:00
Dianne Hackborn
cf3e052139 am 3061d2b9: Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev 
* commit '3061d2b984eed5b9e2d60748cea0a111ba52c758':
  Fix issue #17507017: took ~3 seconds to move an app to the foreground
 2014-09-17 00:21:45 +00:00
Dianne Hackborn
44dd996b62 am 1a7cb969: Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 
* commit '1a7cb969b833be16632cbcadc498a1fb978ca659':
  Fix issue #16662560: SingleTop activity is getting instantiated multiple time
 2014-09-17 00:21:40 +00:00
Dianne Hackborn
6035379865 Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev 2014-09-17 00:14:44 +00:00
Dianne Hackborn
1a526f582b Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 2014-09-17 00:13:38 +00:00
Robert Greenwalt
42a69ffa04 am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:13:14 +00:00
Adrian Roos
571ca37d0f am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '3c782941ff6b684fe417c5c737e012342a778850':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-17 00:06:21 +00:00
Robert Greenwalt
e7b26be378 Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b Add NetworkAgent event for ExplicitlySelected 
Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
 2014-09-16 17:03:59 -07:00
Brian Attwell
e3a742f5a0 am 942be889: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '942be889125d2530091f192a8872009580594313':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:58:09 +00:00
Adrian Roos
aa52631f7c am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-16 23:58:06 +00:00
Brian Attwell
9958a3ad32 am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:45:41 +00:00
Alan Viverette
1ebc3fb56b am 36c132a8: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '36c132a84be88e395e567c66ccc897c6fe628c62':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:43:02 +00:00
Alan Viverette
03b51f427f am 17f9b8d6: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '17f9b8d6f921dd2c8ce5f265645e63919d9dd474':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:42:57 +00:00
Alan Viverette
ae1bd20274 am f335590a: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit 'f335590ac08e1bfa9f38e21c1157c8fc1799a5d9':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:42:51 +00:00
ztenghui
7085d44c31 am 174d2fbd: am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit '174d2fbd82cd3550393400e16459e62e4680e6c0':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:42:46 +00:00
Adrian Roos
543f21da46 Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265 Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 2014-09-16 23:33:24 +00:00
Alan Viverette
8058f9774f am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '67798394819f1b8af9afb8f35fda0d0f0552f027':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:30:15 +00:00
Alan Viverette
5a4b2bf9b2 am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:30:10 +00:00
Alan Viverette
d82fa0d3c8 am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:30:03 +00:00
ztenghui
d1df07897e am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit '0fed84e1e4674353892143103ba0ebdf36b0c71d':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:29:58 +00:00
Alan Viverette
af8e823d99 Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 2014-09-16 23:25:07 +00:00
Alan Viverette
4813482324 Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 2014-09-16 23:23:23 +00:00
Dianne Hackborn
7922882189 Fix issue #16662560: SingleTop activity is getting instantiated multiple time 
Introduce a concept of a "root affinity" to a task -- this is the
affinity of the initial activity in the task.  Use this instead of
the current affinity in findTaskLocked(), where we look for an
existing task to use for a NEW_TASK intent.

This changes the semantics of the new "relinquish task identity" mode
so that it doesn't relinquish the root affinity of the task.  This
means when we are in the old style application-based recents matching
of findTaskLocked(), we will never count these tasks as the same as
the application's tasks only because they have relinquished their
identity to that application.  This is probably okay, it is basically
putting a different line between new document-centric recents and
old application-centric recents when they are mixed together.

Change-Id: I73a22ead9bd08e98bf67ad035a017f828c6a6715
 2014-09-16 16:22:55 -07:00
Alan Viverette
96f26b8039 Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 2014-09-16 23:20:28 +00:00
ztenghui
f74879fb4d Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 2014-09-16 23:18:37 +00:00
Robert Greenwalt
390a961720 am ee48c9ef: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'ee48c9ef54a884cd7f2162163252c1bf156a0a2d':
  Report Network status to NetworkAgent.
 2014-09-16 23:14:50 +00:00
Craig Mautner
6e85aada76 am b23fec37: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'b23fec371a22975abfb5a2951b4cf05d4b7238f2':
  Restore changes that were needed.
 2014-09-16 23:14:46 +00:00
Alan Viverette
6a3276e05a am 53e29e82: am af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 
* commit '53e29e820ad9eead4453a3959471edd6658f9f75':
  Increase clock and calendar haptic feedback durations
 2014-09-16 23:14:40 +00:00
Robert Greenwalt
b4e0593c22 am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:56 +00:00
Craig Mautner
f9f5f56488 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:20 +00:00
Alan Viverette
f1482579ed am af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 
* commit 'af3be19be22193bd8431cc5c65f119e4b651368a':
  Increase clock and calendar haptic feedback durations
 2014-09-16 23:00:15 +00:00
Robert Greenwalt
b4f601cb84 Merge "Report Network status to NetworkAgent." into lmp-dev 2014-09-16 22:59:33 +00:00
Craig Mautner
fb1bf84165 Merge "Restore changes that were needed." into lmp-dev 2014-09-16 22:53:34 +00:00
Alan Viverette
f1820064d9 Ensure we always have valid colors in CaptionStyle 
BUG: 17521623
Change-Id: I861aa189970fc14dd3e4426e5487a14f373d3a2e
 2014-09-16 15:53:33 -07:00
Alan Viverette
dc7df6497a Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 2014-09-16 22:50:45 +00:00
Craig Mautner
a67d9095b7 Restore changes that were needed. 
Reverting the changes in ag/548487 also reverted alanv's changes
in ag/547793. This restores alanv's changes.

Fixes build.

Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9
 2014-09-16 15:50:32 -07:00
Brian Attwell
e0e4217330 Pass different dy into dispatchNestedSCroll 
Bug: 16462679
Bug: 17529919
Change-Id: I328457a27507253cc7bfeab0e2daa4d4563aab17
 2014-09-16 22:48:27 +00:00
ztenghui
77a12e897e Update the progress bar to square instead of round lineCap 
b/17206751

Change-Id: I4125a1e677d2888ad1c3580dc44d5983e623cda7
 2014-09-16 15:41:42 -07:00