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

152456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
9091f9b906 am 1e4d9476: am 1a7cb969: Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 
* commit '1e4d9476d4313e352b80d53ccf36bd9a6e844e72':
  Fix issue #16662560: SingleTop activity is getting instantiated multiple time
 2014-09-17 00:28:07 +00:00
Robert Greenwalt
f10a848754 am 061ac1be: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit '061ac1be70acff38bb2caa58bd3b6ea08c2e79a9':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:28:04 +00:00
Dianne Hackborn
e55039dc96 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:04 +00:00
Dianne Hackborn
d3f69e7d80 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:00 +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
Robert Greenwalt
9e1d9f0fb2 am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:13:54 +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
e7b26be378 Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 2014-09-17 00:06:03 +00:00
Adrian Roos
1378434063 am bf665282: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit 'bf665282fe1a0b7caf9dc5a2b3ba5378d3ac35f3':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-17 00:05:58 +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
Adrian Roos
d804482660 am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-16 23:58:07 +00:00
Brian Attwell
c990260259 am 9c943a94: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '9c943a94ad9926611ca960b9abd481a7e7ad1263':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:54:57 +00:00
Michael Wright
b1e3b70aeb Remove Rhodi keylayout 
Looks like Broadcom re-used the Rhodi PID since we never shipped.
Remove the keylayout so we don't accidentally use it for other
devices.

Bug: 17504946
Change-Id: Ia11ad40f8ba7d49f82e7f68d881cf7c9bfafcb37
 2014-09-16 16:48:58 -07:00
Brian Attwell
598c4f9329 am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:45:03 +00:00
Adrian Roos
543f21da46 Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 2014-09-16 23:42:40 +00:00
Alan Viverette
e3aecc6c02 am b22bd84e: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit 'b22bd84e6cb81a1e27688011631498f441f6f393':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:41:35 +00:00
Alan Viverette
cf7cc557d8 am 86633337: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '866333376e1a6933e194ab8989b77c84be8ad334':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:41:31 +00:00
Alan Viverette
d2ab11651a am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '27cf6cecf11c6afa918ff860ccb2f24ae94b38af':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:41:27 +00:00
ztenghui
dd802636b9 am ff2c92d7: am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit 'ff2c92d72087b73de7393261670a74f504e5110e':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:41:24 +00:00
Brian Attwell
5665c0f265 Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 2014-09-16 23:33:24 +00:00
Alan Viverette
56debf9a14 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:54 +00:00
Alan Viverette
e748ca5dc9 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:50 +00:00
Alan Viverette
6acb495af2 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:46 +00:00
ztenghui
c209535d5e 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:30:42 +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
8316e5e043 am 3a68c1e8: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit '3a68c1e8588f8f278655a7d00e52f206bdae596c':
  Report Network status to NetworkAgent.
 2014-09-16 23:12:10 +00:00
Craig Mautner
b451a839e2 am bfff2d63: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'bfff2d63e4a09fba5223019761ea5ff0d7fe72ab':
  Restore changes that were needed.
 2014-09-16 23:12:07 +00:00
Alan Viverette
dd31162f14 am a81d8c8b: am af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 
* commit 'a81d8c8bb7750379997ab192c851e0ea4e50d56a':
  Increase clock and calendar haptic feedback durations
 2014-09-16 23:12:03 +00:00
Robert Greenwalt
9d1723558b am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:35 +00:00
Craig Mautner
ea0dbf3fa2 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:11 +00:00
Alan Viverette
d56c257116 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:08 +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
Alan Viverette
fe16787bd4 Preserve NPE behavior of removed TextView.getTextColors() API 
BUG: 17511449
Change-Id: Iea7e9aed69c21b230e3c474d4c1378a8663cfcb1
 2014-09-16 15:41:27 -07:00
Craig Mautner
dd7d8c504b am 3d94fdac: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit '3d94fdac1d021d5de943705feedd0e488015cc27':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:39:19 +00:00
Craig Mautner
a0610d425f am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'b53e4c4a3879b0a3e649e62a07734643ee3122ae':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:24:10 +00:00
John Spurlock
4649edfef1 am cd1cba7d: am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev 
* commit 'cd1cba7d6571d6e517aecc31a0f6d5741a03e491':
  Zen: Fix recent regression in mode selection after reboot.
 2014-09-16 22:16:41 +00:00
Craig Mautner
704991224d Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 2014-09-16 22:16:29 +00:00
Craig Mautner
706b3547f8 Revert "Fix various bugs in DatePickerCalendarDelegate" 
alanv@ fixed this yesterday.

This reverts commit 82537efa4c5f4aad12b9aa249fb27eda21647f39.

Change-Id: If2b91ee36f8b24f695200ac1a87a306246ee5e44
 2014-09-16 22:13:39 +00:00
Alan Viverette
82ed5df115 Increase clock and calendar haptic feedback durations 
Some devices don't handle sub-15ms vibration durations very well.

BUG: 17511995
Change-Id: I2212ed9f37f3446e6f4ac5985906294121d39a9d
 2014-09-16 15:08:10 -07:00
John Spurlock
dfa1eb833c am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev 
* commit '183cd9947e19d19e635db8912112bdaf81be9db8':
  Zen: Fix recent regression in mode selection after reboot.
 2014-09-16 22:07:29 +00:00