78180 Commits

Author SHA1 Message Date
Craig Mautner
d1b1bef463 am de1ddd0f: Merge "Better handle changing app transitions." into jb-dev
* commit 'de1ddd0f93fae6ba517d516993e7fb495424f574':
  Better handle changing app transitions.
2012-05-29 13:55:23 -07:00
Craig Mautner
de1ddd0f93 Merge "Better handle changing app transitions." into jb-dev 2012-05-29 13:53:06 -07:00
Jim Miller
4abf86ed20 am a073e570: Fix 6398209: General animation improvements for swipe to search
* commit 'a073e570789e5b49e8339af44516444b13db4428':
  Fix 6398209: General animation improvements for swipe to search
2012-05-29 13:16:22 -07:00
Craig Mautner
1d961d46d6 Better handle changing app transitions.
When we are in the middle of an app transition and need to change to a
new one we were not ending the old one in a clean state. Also,
wallpapers were defaulting to the wrong animation in certain
situations.

Remove ':' style iterators.

Fixes bug 6486708.

Change-Id: Ied17e8410486020295db380ff68df5dad08bc5cc
2012-05-29 13:00:25 -07:00
Jim Miller
a073e57078 Fix 6398209: General animation improvements for swipe to search
This cleans up the animation for swipe to search from the navbar.  In particular:
1. Wait for initial animation to finish if gesture was too quick.
2. Better fade animation
3. Hide background and fade in when ring is selected
4. Smoother target and outer ring animation when switching between states.

Change-Id: I401197760cf9f06b6ff3e1cdb80bee86a03ef276
2012-05-29 12:49:23 -07:00
Michael Jurka
4265686730 am a66c75a8: Merge "Fix bug where recents was getting preloaded unnecessarily" into jb-dev
* commit 'a66c75a87e3485773430974b9bc314d010ba3542':
  Fix bug where recents was getting preloaded unnecessarily
2012-05-29 12:29:49 -07:00
Michael Jurka
a66c75a87e Merge "Fix bug where recents was getting preloaded unnecessarily" into jb-dev 2012-05-29 12:26:35 -07:00
Winson Chung
f6663f0235 am 1ee0a7d4: Merge "Fixing typos related to portrait enums." into jb-dev
* commit '1ee0a7d44a577dd19b022ff9247495f660d1ade8':
  Fixing typos related to portrait enums.
2012-05-29 12:20:23 -07:00
Andrew Flynn
10864c5442 am 15332efd: Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev
* commit '15332efd2c4dd9b96368a58216e13d083638dbae':
  Set phone/data signal icon ids to 0 in airplane mode
2012-05-29 12:20:21 -07:00
Winson Chung
1ee0a7d44a Merge "Fixing typos related to portrait enums." into jb-dev 2012-05-29 12:19:10 -07:00
Andrew Flynn
15332efd2c Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev 2012-05-29 12:18:22 -07:00
Craig Mautner
dfcdde7902 am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev
* commit '1dee8974693fff55e276e0aed1202e43904bb944':
  Track animating apps up until animation starts.
2012-05-29 11:48:45 -07:00
Craig Mautner
1dee897469 Merge "Track animating apps up until animation starts." into jb-dev 2012-05-29 11:45:16 -07:00
Winson Chung
ba6be29fe0 Fixing typos related to portrait enums.
Change-Id: Ia2ca7aebec7c9adba093aec594429c9f01875448
2012-05-29 11:39:11 -07:00
Amith Yamasani
bd817711d7 am 3dac0226: Merge "Show power menu on tablets." into jb-dev
* commit '3dac02265e42bf176e26b83da430ce15d6fd06df':
  Show power menu on tablets.
2012-05-29 11:26:16 -07:00
Amith Yamasani
3dac02265e Merge "Show power menu on tablets." into jb-dev 2012-05-29 11:22:32 -07:00
Craig Mautner
06a94f710d Track animating apps up until animation starts.
ActivityStack sets the mNextAppTransition value before moving the apps
to their proper position. This makes the test for mNextAppTransition
being TRANSITION_UNSET incorrect. Better to just look for animating.

Fixes bug 6565418.

Change-Id: I4651b7d3678e46fc712a8e901992fb01b94c415e
2012-05-29 10:46:00 -07:00
The Android Open Source Project
42e55e64c1 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
2012-05-29 09:39:33 -07:00
The Android Automerger
b1aed8429e merge in jb-release history after reset to jb-dev 2012-05-29 08:58:07 -07:00
Michael Jurka
fc9c4434da am 48c22c84: Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev
* commit '48c22c84c089213dda6495fbdeb384e400c7c5c5':
  Adding debugging code for bug where recycled views still had parent
2012-05-29 08:44:31 -07:00
Michael Jurka
48c22c84c0 Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 2012-05-29 08:41:49 -07:00
Michael Jurka
4004033f87 Fix bug where recents was getting preloaded unnecessarily
Change-Id: I7d2254da009113f81fae0a785583b1c7fd6ad020
2012-05-29 08:25:32 -07:00
Danielle Millett
d965019105 am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
* commit '45973d6d19eb9329d77e62004e80f63f111a27e5':
  Moved setting the flag to suppress face unlock during a phone call
2012-05-29 06:27:14 -07:00
Danielle Millett
45973d6d19 Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 2012-05-29 06:24:05 -07:00
Michael Jurka
b2a5d9e546 Adding debugging code for bug where recycled views still had parent
Bug: 6499508
Change-Id: Iaf95ee6a0836c5f1e863d6a5b969e032d36a2b27
2012-05-29 03:44:18 -07:00
Bryan Mawhinney
592a3f5447 am c3a5cf9a: Actually set the video scaling mode :-)
* commit 'c3a5cf9aab3d409445accb2a93c09e6b4140d196':
  Actually set the video scaling mode :-)
2012-05-27 12:50:40 -07:00
Bryan Mawhinney
c3a5cf9aab Actually set the video scaling mode :-)
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
2012-05-27 17:42:46 +01:00
Romain Guy
59893daa50 am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev
* commit 'bbedfa0036f8de393c05b2ad981695ae74e7ab42':
  Tale of status bar on crespo, part 3 Bug #6541079
2012-05-25 19:23:48 -07:00
Romain Guy
bbedfa0036 Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 2012-05-25 19:21:49 -07:00
Jeff Brown
9026fecd51 am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev
* commit 'd4cf7e7b06e6870d447dbed2683b8849cfe5336b':
  Don't ANR on hover, scroll or if a window goes away.
2012-05-25 18:41:20 -07:00
Jeff Brown
d4cf7e7b06 Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev 2012-05-25 18:38:24 -07:00
Chet Haase
9d8933ec11 am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev
* commit 'a27551dde853733e89aa16b6fb096186b08c5d81':
  Make Google search panel go away when receiving phone call
2012-05-25 15:52:01 -07:00
John Reck
2611f1eced am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
  Copy over the scroll position for the scrolling layer
2012-05-25 15:51:58 -07:00
Chet Haase
a27551dde8 Merge "Make Google search panel go away when receiving phone call" into jb-dev 2012-05-25 15:49:47 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
Amith Yamasani
7ee994d728 Show power menu on tablets.
Bug: 6524432

Show power menu on all devices by default. Specific devices will be disabled in overlays.

Handle airplane mode changes differently when the telephony states are not reliable.
Use simple toggle for silent mode when there's no vibrator.

Change-Id: Ic5ef521eee19cd300d909250203ff204f3a1ae1e
2012-05-25 15:18:21 -07:00
Irfan Sheriff
7d16bf4085 am e2417b7a: Merge "Retain device during connecting state" into jb-dev
* commit 'e2417b7a6ef2ba539be70574fe7c9e1af4810dd4':
  Retain device during connecting state
2012-05-25 15:15:32 -07:00
Irfan Sheriff
e2417b7a6e Merge "Retain device during connecting state" into jb-dev 2012-05-25 15:13:27 -07:00
Brandon Keely
c3750d068c am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev
* commit '3ef8dd2b399109c2c9b05ea24315bcc2e0ba8df2':
  For 720dp devices, less motion during task-to-task transition.
2012-05-25 14:41:52 -07:00
Brandon Keely
3ef8dd2b39 Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 2012-05-25 14:38:47 -07:00
Eric Fischer
edabf9c75e am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'dfaadf9dae65e4e3cee7430908c98614bb208d20':
  Import translations. DO NOT MERGE
2012-05-25 14:28:07 -07:00
Eric Fischer
dfaadf9dae Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:24:44 -07:00
Eric Fischer
085e879629 am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'aed9b810a538fa02cc5f104e29841c90977ebeaa':
  Import translations. DO NOT MERGE
2012-05-25 14:18:47 -07:00
Eric Fischer
aed9b810a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:14:55 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
2012-05-25 14:02:26 -07:00
Fabrice Di Meglio
b354f987d3 am d5f3798d: Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev
* commit 'd5f3798d6b5cc6404aa03396b440b56415f00ca8':
  Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
2012-05-25 13:52:46 -07:00
Fabrice Di Meglio
d5f3798d6b Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 2012-05-25 13:49:39 -07:00
Chet Haase
ff20b0c0ef Make Google search panel go away when receiving phone call
Issue #6557847 "Google" launcher icon stuck in ring slider after getting incoming call

Change-Id: If77f66fd241af7fbfe6228498b07fd1cfcef36bd
2012-05-25 13:38:10 -07:00
Eric Fischer
b80d834ca0 Import translations. DO NOT MERGE
Change-Id: I893c25a4fd206d9b0c018c44e4441ef36d12eed0
2012-05-25 13:32:45 -07:00
Fabrice Di Meglio
4d0d38b9f4 Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
- close Recent Apps before launching the Assistant

Change-Id: I823dc254252fb3c1fde0a3adcfb895e368c7d77e
2012-05-25 13:14:02 -07:00