Amith Yamasani
fbb417f874
am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit '6facef70b5d6588450c6ee59a676a0cf3bfc745e':
Do cleanup when Stopping users
2012-10-16 21:45:59 -07:00
Amith Yamasani
6facef70b5
am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit 'b6c171b1afa871aa092dd2ec2ed25f48275ef194':
Do cleanup when Stopping users
2012-10-16 21:43:20 -07:00
Romain Guy
e557b0ca62
am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
...
* commit '3d2ecafd7742a93a3ca83993cf12f352aa998112':
workaround to unbreak the build (deadlock during boot)
2012-10-16 21:42:47 -07:00
Amith Yamasani
b6c171b1af
Merge "Do cleanup when Stopping users" into jb-mr1-dev
2012-10-16 21:41:28 -07:00
Romain Guy
3d2ecafd77
am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
...
* commit 'ec5acee17a2210c3abcb25406c087901fda77757':
workaround to unbreak the build (deadlock during boot)
2012-10-16 21:40:18 -07:00
Romain Guy
ec5acee17a
Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
2012-10-16 21:37:07 -07:00
Daniel Sandler
87540b2264
am cce71837: am b6454adb: Merge "Quickening." into jb-mr1-dev
...
* commit 'cce71837337e91e03c1519b26fd8aaa3e77e3ffb':
Quickening.
2012-10-16 21:36:00 -07:00
Daniel Sandler
cce7183733
am b6454adb: Merge "Quickening." into jb-mr1-dev
...
* commit 'b6454adb6c36290550105dd7e085c0d97e07c46f':
Quickening.
2012-10-16 21:32:36 -07:00
Daniel Sandler
b6454adb6c
Merge "Quickening." into jb-mr1-dev
2012-10-16 21:30:23 -07:00
Mathias Agopian
a33d161250
workaround to unbreak the build (deadlock during boot)
...
bug: 7363206
Change-Id: Ie79c309e367ba07336a5299af9fd59c6bd2390e7
2012-10-16 21:26:43 -07:00
Baligh Uddin
a9585ce758
am adcbce49: am c3984879: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'adcbce49f370348297eca441185c61b672158b0d':
Import translations. DO NOT MERGE
2012-10-16 21:24:11 -07:00
Baligh Uddin
adcbce49f3
am c3984879: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c39848793c4067f2597d1ee8f0b6966b4c4e0bef':
Import translations. DO NOT MERGE
2012-10-16 21:21:40 -07:00
Baligh Uddin
85a2223ae9
am 753063f8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '753063f898c6df97e5b177f4f57f530b8c3ba5b0':
Import translations. DO NOT MERGE
2012-10-16 21:20:16 -07:00
Baligh Uddin
c39848793c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 21:18:47 -07:00
Baligh Uddin
753063f898
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 21:17:49 -07:00
Baligh Uddin
3383ab2f4e
am c585612a: am 779a19fe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c585612a907611ae073bff791c4b5321552d2655':
Import translations. DO NOT MERGE
2012-10-16 21:16:34 -07:00
Baligh Uddin
a8e8c363bf
am d3674317: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'd3674317b04be487f06716f3e0f8da0157cc1ec4':
Import translations. DO NOT MERGE
2012-10-16 21:16:34 -07:00
Baligh Uddin
c585612a90
am 779a19fe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '779a19fe447a1be43a4a435c43718357b127c852':
Import translations. DO NOT MERGE
2012-10-16 21:14:48 -07:00
Baligh Uddin
779a19fe44
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 21:11:18 -07:00
Baligh Uddin
d3674317b0
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 21:09:59 -07:00
Daniel Sandler
3679bf58fb
Quickening.
...
+ Baseline align all header elements.
+ Make clock clickable.
+ Remove clock tile.
+ Reorder tiles.
+ Hide status bar behind panel on phones.
+ Make status bar peek animation show the whole header on phones.
+ Stop hiding status bar bits on phones.
Bug: 7350584 // baseline align header, make clock clickable,
Bug: 7351760 // hide status bar behind panel
Change-Id: I888752b64c56e80c3f5581fd8ee1cfd7c50eab7c
2012-10-16 23:21:26 -04:00
Svetoslav Ganov
40577560c9
am 61fa73c5: am 05ad745f: Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
...
* commit '61fa73c51e811f5d1cc3ad1d3645863d13befdc0':
Long press not working if explore by touch and magnification are on.
2012-10-16 19:55:58 -07:00
Svetoslav Ganov
61fa73c51e
am 05ad745f: Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
...
* commit '05ad745ff63ed3bcdb86d42290ddc2ee214fe90f':
Long press not working if explore by touch and magnification are on.
2012-10-16 19:53:38 -07:00
Svetoslav Ganov
05ad745ff6
Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
2012-10-16 19:50:22 -07:00
Jim Miller
ef512f03e3
am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
...
* commit 'cccf85c287aea85121b15280bf3a89a2b7d3926b':
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
2012-10-16 19:28:28 -07:00
Jim Miller
cccf85c287
am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
...
* commit '8e6145013a6533ca6a33e03c8a5e45ad2de431e4':
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
2012-10-16 19:26:00 -07:00
Jim Miller
8e6145013a
Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
2012-10-16 19:22:37 -07:00
Romain Guy
b7b30eb057
am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771 " into jb-mr1-dev
...
* commit 'fa71ba2c847622c0b23321477b3914f4a4cdd536':
Add API to enable mipmaps on Bitmap Bug #7353771
2012-10-16 19:11:13 -07:00
Romain Guy
fa71ba2c84
am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771 " into jb-mr1-dev
...
* commit '1b85122bd22c4528679ae8bd67077dfc2fdf1847':
Add API to enable mipmaps on Bitmap Bug #7353771
2012-10-16 19:08:48 -07:00
Romain Guy
1b85122bd2
Merge "Add API to enable mipmaps on Bitmap Bug #7353771 " into jb-mr1-dev
2012-10-16 19:05:49 -07:00
Craig Mautner
9cf13e5beb
am aa2804aa: am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'aa2804aa2bf1a2c89af947501549361945ffac3f':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:04:04 -07:00
Craig Mautner
aa2804aa2b
am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'e13ae648504661ca158d15aa415568e351b380c4':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:01:35 -07:00
Jim Miller
dcf59629be
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
...
Revert "Revert "Revert "Fix for bug 6050753."""
This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d
Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
2012-10-16 19:01:32 -07:00
Craig Mautner
e13ae64850
Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
2012-10-16 18:58:58 -07:00
Romain Guy
713e1bb9df
Add API to enable mipmaps on Bitmap
...
Bug #7353771
This API can be used when scaling large images down to a small size
to get nicer looking results.
Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
2012-10-16 18:44:09 -07:00
Svetoslav Ganov
72e3512960
Long press not working if explore by touch and magnification are on.
...
1. In the magnifier we are caching the touch events until we figure
out whether the user is triple tapping to enable magnification.
If the user is not trying to engage magnification we deliver the
stashed events. However, these events are stale and the subsequent
transformations such as the touch explorer get confused when trying
to detect a tap since the delay is longer than the tap slop.
This change compensates for the time the events were cached
before sending them to the next transformation in the chain.
bug:7362365
Change-Id: Idd8539ffed7ba4892c5a916bd34910fd2ef50f75
2012-10-16 18:26:57 -07:00
Steven Ross
80c0413af6
am 9dff9125: am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
...
* commit '9dff9125074bfd1a4ead4ba995fd830b9a121263':
Stopping Face Unlock immediately on detaching from window fixes 7338808
2012-10-16 17:51:01 -07:00
Steven Ross
9dff912507
am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
...
* commit 'e4728b15cba1cebb8d9f60d146d95ff58a945ad8':
Stopping Face Unlock immediately on detaching from window fixes 7338808
2012-10-16 17:47:23 -07:00
Steven Ross
e4728b15cb
Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
2012-10-16 17:44:53 -07:00
Christopher Tate
19f561580a
am f0bba8a8: am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
...
* commit 'f0bba8a8d0ace06f786bc0d78b0ed3ea3ae59814':
Fix ApplicationInfo copy ctor
2012-10-16 17:39:42 -07:00
Christopher Tate
f0bba8a8d0
am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
...
* commit '69b0c974b5abb38a4443410cf09f7d5f28cf2c7f':
Fix ApplicationInfo copy ctor
2012-10-16 17:37:46 -07:00
Christopher Tate
69b0c974b5
Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
2012-10-16 17:33:55 -07:00
Jim Miller
366a6f2bf3
am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
...
* commit 'ac8b732e37ab68046c46b48302663e00a8dcb334':
Fix missing layout parameters in keyguard.
2012-10-16 17:33:23 -07:00
Laurent Tu
9bebd2a438
am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit '130ba7dae85afc46e0066114a33acba5eee7530c':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:33:16 -07:00
Jim Miller
ac8b732e37
am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
...
* commit '48994ce9451cccb9ee6a6a27c18dbaaddffca452':
Fix missing layout parameters in keyguard.
2012-10-16 17:30:46 -07:00
Laurent Tu
130ba7dae8
am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit 'de5c3a04517bba3adacd8c6eb2b365cf93c73a69':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:30:43 -07:00
Jim Miller
48994ce945
Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
2012-10-16 17:28:08 -07:00
Jeff Brown
63241c51b7
am 5d32cba6: am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '5d32cba6e42c9b7b1ce61e5ea4f6a2940347efdd':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:27:45 -07:00
Laurent Tu
de5c3a0451
Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
2012-10-16 17:27:09 -07:00
Daniel Sandler
c7edbf4d66
am 2b7ed31f: am fe3376b4: Fix NPE in quick settings tiles.
...
* commit '2b7ed31f8b851a588db7c9acdae8a60b35940fe3':
Fix NPE in quick settings tiles.
2012-10-16 17:26:02 -07:00