Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,809 Commits 3 Branches 0 Tags
709d138d2fbbfbcddde9c87528151dc897095742
Commit Graph

24471 Commits

Author SHA1 Message Date
Dianne Hackborn
709d138d2f am eef61216: am 8e11051a: Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 
* commit 'eef61216183b77842d06533fcc661020c0032d2d':
  Tweak anim API to automatically call Intent.setSourceBounds().
 2012-05-08 15:02:13 -07:00
Glenn Kasten
1f3899d418 am cceaf8d8: am ebd6016b: Merge "Add audio tag to systrace" into jb-dev 
* commit 'cceaf8d80d29879c3ce045b8bed92181aaee9d8e':
  Add audio tag to systrace
 2012-05-08 15:01:46 -07:00
Dianne Hackborn
2a8650bdca am 009e6e6b: am bae365c1: Merge "Fix issue #6319312: Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev 
* commit '009e6e6b5e83f18cd691d69dc5f08e04bfccf059':
  Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()...
 2012-05-08 15:01:27 -07:00
Jim Miller
6dfe7d937f am 07e1f123: am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit '07e1f12350819cc8fa93dbfe9e8655594b859e64':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-08 11:33:38 -07:00
Matthew Xie
88dcbda03b am 87d7c1d7: am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit '87d7c1d740c93147a762595fd7e415dbebfb182f':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-08 11:33:35 -07:00
Jim Miller
56f895a2fc am 8676726d: am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '8676726dcfa54e4fecb0c0676d9945ad49f079c5':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-08 11:33:22 -07:00
Robert Greenwalt
1fee5ef1aa am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit 'd760beb735538d61d78584722352a888629b670a':
  Bring up the ethernet interface when detected
 2012-05-08 11:32:41 -07:00
Philip Milne
3ed259a43c am 2a52d26c: am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '2a52d26c0b917de8b1e4d20ebad87b9b3825f6ca':
  Hide optical bounds feature for JB.
 2012-05-08 11:32:06 -07:00
Amith Yamasani
988b832b34 am 503b2e5a: am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '503b2e5ae1b83e5595b47a8d376db6b89b059b87':
  Javadoc improvements in SearchView per API review.
 2012-05-08 11:29:57 -07:00
John Reck
2eeec7189e am 462ee95f: am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit '462ee95ff0cfb01d295c0b7e34bf995a50edb313':
  Remove heldMotionless disabling native scroll mode
 2012-05-08 11:29:54 -07:00
Gilles Debunne
bb5971a78f am 8779c022: am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '8779c022b401b2a269e058c2c27b885694b696f3':
  Final fix in SpannableStringBuilder.
 2012-05-08 11:29:49 -07:00
Dianne Hackborn
eef6121618 am 8e11051a: Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 
* commit '8e11051a06b3362b7d7cda654f8dcb5ca3760494':
  Tweak anim API to automatically call Intent.setSourceBounds().
 2012-05-07 16:15:25 -07:00
Dianne Hackborn
8e11051a06 Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 2012-05-07 16:12:44 -07:00
Dianne Hackborn
d367ca88ee Tweak anim API to automatically call Intent.setSourceBounds(). 
Also don't retain the source bounds in recent tasks, since it
has no meaning there and it would be better when relaunching an
activity to have a new bounds set based on wherever it is now
being launched from.

Change-Id: Ia90c04ee98a888a7f725b038abe23d71e2b12800
 2012-05-07 15:54:58 -07:00
Glenn Kasten
cceaf8d80d am ebd6016b: Merge "Add audio tag to systrace" into jb-dev 
* commit 'ebd6016b8c6faf70b44283c59461023cda1ca6b0':
  Add audio tag to systrace
 2012-05-07 15:48:43 -07:00
Glenn Kasten
ebd6016b8c Merge "Add audio tag to systrace" into jb-dev 2012-05-07 15:45:03 -07:00
Dianne Hackborn
009e6e6b5e am bae365c1: Merge "Fix issue #6319312: Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev 
* commit 'bae365c166538d5c2319bf42aaf1715a1fb749e7':
  Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()...
 2012-05-07 15:14:50 -07:00
Dianne Hackborn
bae365c166 Merge "Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()..." into jb-dev 2012-05-07 15:12:33 -07:00
Dianne Hackborn
755c8bfbff Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()... 
...without onPause() in between

There was a bug in the handling of "always finish activities" where we
would go through destroying activities while in the middle of updating
the activity stack.  This would result in the activity behind the
non-full-screen activity being created and then immediately destroyed,
which things were not expecting.

Change-Id: Idaa89089f7b1af7eb747d7b8f9f394beeb2d23fa
 2012-05-07 15:06:09 -07:00
Jim Miller
07e1f12350 am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit 'a482f942dae90211540c856664ca71ba29297309':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-07 14:51:19 -07:00
Jim Miller
a482f942da Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 2012-05-07 14:48:19 -07:00
Matthew Xie
87d7c1d740 am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit 'ac8a61b6d47e737794b2aaeaf629d87e493413b8':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-07 14:41:41 -07:00
Jim Miller
72b26c1fa2 Fix 6397736: Fix issue with MultiWaveView in incoming call screen. 
This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd
 2012-05-07 14:39:31 -07:00
Matthew Xie
ac8a61b6d4 Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 2012-05-07 14:38:42 -07:00
Jim Miller
8676726dcf am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '06e8d6647db54aa76dda92a5a785737e66d262de':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-07 14:37:39 -07:00
Jim Miller
06e8d6647d Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 2012-05-07 14:34:00 -07:00
Robert Greenwalt
d760beb735 am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit '2321301fe75f945b002372d6d35c597191564452':
  Bring up the ethernet interface when detected
 2012-05-07 13:42:53 -07:00
Robert Greenwalt
2321301fe7 Merge "Bring up the ethernet interface when detected" into jb-dev 2012-05-07 13:39:34 -07:00
Philip Milne
2a52d26c0b am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0':
  Hide optical bounds feature for JB.
 2012-05-07 13:09:14 -07:00
Robert Greenwalt
198bc11d09 Bring up the ethernet interface when detected 
We don't get link status info if it's down.  If the device has been configured
for ethernet and we see the interface appear, we should make it active.

bug:6444395
Change-Id: Ibc233ab12942b069d7db9c0671936798c5161659
 2012-05-07 12:34:26 -07:00
Philip Milne
7bb66c9cae Hide optical bounds feature for JB. 
Change-Id: I1fe38e9c64515acd550baa930ebc0af4c139bf40
 2012-05-07 11:42:57 -07:00
Amith Yamasani
503b2e5ae1 am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '44e3f88f2f80c7dfbe36c22878d129251ba13165':
  Javadoc improvements in SearchView per API review.
 2012-05-07 11:35:47 -07:00
John Reck
462ee95ff0 am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit 'a09b06effff87f9c073cdc7729884adc41286fe1':
  Remove heldMotionless disabling native scroll mode
 2012-05-07 11:35:44 -07:00
Amith Yamasani
44e3f88f2f Merge "Javadoc improvements in SearchView per API review." into jb-dev 2012-05-07 11:33:16 -07:00
John Reck
a09b06efff Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 2012-05-07 11:33:13 -07:00
Gilles Debunne
8779c022b4 am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '0caf421e3aacea928f2ce0e99e101a6584127527':
  Final fix in SpannableStringBuilder.
 2012-05-07 11:22:26 -07:00
Gilles Debunne
0caf421e3a Merge "Final fix in SpannableStringBuilder." into jb-dev 2012-05-07 11:17:38 -07:00
Glenn Kasten
ed853fc4e0 Add audio tag to systrace 
Change-Id: I3c5af7c5d166ff24ef57918a4dbda6327b03cc1f
 2012-05-07 11:05:55 -07:00
Selim Gurun
13d736951d am 5d13e8ef: am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit '5d13e8ef83207e076f3a38cf713706e9975562ec':
  Use private key context when necessary
 2012-05-07 11:01:27 -07:00
Matthew Xie
b12d6bc3a5 When turning off, broadcast STATE_OFF in the last HotOff state 
This is because we do HotOff -> PowerOff -> HotOff for USER_TURN_OFF
Donot do poweroff for perprocess turn off.
Add small time delays for calls into stack to reset dbus timing.
bug 6438556

Change-Id: Iae8bdd24e41824ed4bc34aca96d082f9284f169c
 2012-05-07 11:01:23 -07:00
Selim Gurun
5d13e8ef83 am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit 'ee00b31a54cc186cb53fe30d7834361791baab20':
  Use private key context when necessary
 2012-05-07 10:56:48 -07:00
Selim Gurun
ee00b31a54 Merge "Use private key context when necessary" into jb-dev 2012-05-07 10:54:24 -07:00
Daisuke Miyakawa
d79cad4c8b am 12ec18bd: am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit '12ec18bdb081ea7a030634191b10d8222f474fde':
  Use callable-filter capability when updating call log
 2012-05-07 10:51:38 -07:00
Daisuke Miyakawa
12ec18bdb0 am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit 'cacba4599381e7bebbe7aa9e450e3b5baf5fd425':
  Use callable-filter capability when updating call log
 2012-05-07 10:48:28 -07:00
Daisuke Miyakawa
cacba45993 Merge "Use callable-filter capability when updating call log" into jb-dev 2012-05-07 10:46:26 -07:00
Romain Guy
c0496ffd0e am 9929b59a: am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9929b59ac5d0c5b0ab400d9d8edf4163ca4c557d':
  Log more frame data when profiling GL apps
 2012-05-07 10:28:44 -07:00
Romain Guy
9929b59ac5 am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9d7bbcb89a3f14331c55ed2bbdcf768a4aa91cc1':
  Log more frame data when profiling GL apps
 2012-05-07 10:25:43 -07:00
Romain Guy
9d7bbcb89a Merge "Log more frame data when profiling GL apps" into jb-dev 2012-05-07 10:23:14 -07:00
Romain Guy
a21f877434 Log more frame data when profiling GL apps 
Change-Id: Ib7377c22a2258aa6510677d80df34bb7e73dc714
 2012-05-07 10:20:52 -07:00
John Reck
4a05c13c0e am 079623be: am ff0e8cd8: Merge "Drain any pending touch events immediately if possible" into jb-dev 
* commit '079623bedf393f8ae14ba077d147b16024152aef':
  Drain any pending touch events immediately if possible
 2012-05-07 10:11:09 -07:00