Baligh Uddin
83fc0be8e7
am 1b9a1418: am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1b9a1418ad7cee07f80ef8eef330ad6c479e34a6':
2012-10-26 15:18:27 -07:00
Baligh Uddin
a625e8a344
am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '19b304e79a05227b6d607dead013c3856e739678':
2012-10-26 15:18:17 -07:00
Robert Ly
f35690d818
am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit '148d413164ce0a780236ffb8ada15cad81be6ce7':
docs: animations au class
2012-10-25 16:34:14 -07:00
Robert Ly
148d413164
am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit '5b45e33770f072e281ddf8cda2ecc039a6caedfc':
docs: animations au class
2012-10-25 16:32:18 -07:00
Robert Ly
5b45e33770
am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit 'd6bbf71dc552d54ffde25e8c00ed96630a5221a6':
docs: animations au class
2012-10-25 16:29:09 -07:00
Robert Ly
d6bbf71dc5
am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit 'ea502b27020872003f1d2be1fb2644b04cc59a67':
docs: animations au class
2012-10-25 16:26:57 -07:00
Robert Ly
ea502b2702
Merge "docs: animations au class" into jb-dev-docs
2012-10-25 16:24:03 -07:00
John Spurlock
22458a4912
am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
...
* commit '5c87f5334a7414f32e32bcfb0d6c56b07048d058':
Revert part of fix for b/7377776 to fix b/7411356.
2012-10-25 14:18:00 -07:00
John Spurlock
5c87f5334a
Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
2012-10-25 14:14:52 -07:00
Robert Ly
3f53212602
docs: animations au class
...
Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea
2012-10-25 13:26:32 -07:00
John Spurlock
3e98b9afe6
Revert part of fix for b/7377776 to fix b/7411356.
...
This means the visual glitch is possible again, but reduced since
the layout transitions are disabled.
It's more important to bring back nav buttons for incoming calls
(for the secure, screen off case).
Bug: 7411356
Change-Id: I83005a77930ec7f70a613b3396f85ab1a5fdd96c
2012-10-25 16:15:30 -04:00
Chet Haase
b36dca1b04
am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
...
* commit '9023cf91018c75a179d04256fd4e306065528117':
Set wallpaper bitmap reference to null before reloading
2012-10-25 12:23:14 -07:00
Chet Haase
9023cf9101
Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
2012-10-25 12:19:34 -07:00
Chet Haase
589a6af173
Set wallpaper bitmap reference to null before reloading
...
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)
Also set the default_wallpaper to the right default size.
Issue #7352961 Wallpaper edge is cut-off while scrolling through home page
Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
2012-10-25 11:57:09 -07:00
Fabrice Di Meglio
3b53061e6d
am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8
Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
...
- made them private and final
- fixed comment
Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
2012-10-25 11:22:39 -07:00
Svetoslav Ganov
b8ee636a86
am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit '324cfc54ed3527b98069f87665504a423bab63e4':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:13:14 -07:00
Svetoslav Ganov
324cfc54ed
Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
2012-10-25 11:09:30 -07:00
Svetoslav Ganov
7fd9882ba3
Accessibility layer in inconsistent state after running UI test automation tests.
...
1. The accessibility layer has a back door for a UI test automation code running
from the shell to attach. The unregister code does an incorrect identity check
and as a result the register UI test automation service is not disconnected
until its process is killed. The fix is super safe and simple.
bug:7409261
Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
2012-10-25 09:41:11 -07:00
Bryan Mawhinney
83d960bffa
am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
...
* commit '33c0a616dbd284b47cc8e6af2eec358fba7c701f':
Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:09:43 -07:00
Bryan Mawhinney
33c0a616db
Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
2012-10-25 02:06:37 -07:00
Dianne Hackborn
72d0a5aa04
am ead7d90e: Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
...
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
Fix issue #7408647 : Add getUserCount() API
2012-10-24 18:02:05 -07:00
Daniel Sandler
0c707b2b7e
am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
...
* commit '38c904a6bc3cc215940ec0d8f96cda9376ff0133':
Be a little more lenient with panel-open gestures.
Missing copyright headers.
2012-10-24 17:59:12 -07:00
Dianne Hackborn
ead7d90e8b
Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
2012-10-24 17:58:13 -07:00
Daniel Sandler
38c904a6bc
Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
...
* changes:
Be a little more lenient with panel-open gestures.
Missing copyright headers.
2012-10-24 17:55:10 -07:00
Dianne Hackborn
b26306ad52
Fix issue #7408647 : Add getUserCount() API
...
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Irfan Sheriff
88d254cffb
am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
...
* commit '4e7f2ffe1791807636ac542f73016773c30daa92':
Handle group tear down only at group removed event
2012-10-24 15:26:28 -07:00
Irfan Sheriff
4e7f2ffe17
Merge "Handle group tear down only at group removed event" into jb-mr1-dev
2012-10-24 15:23:47 -07:00
Irfan Sheriff
2bc0c5fef2
Handle group tear down only at group removed event
...
Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails
Bug: 7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
2012-10-24 15:05:56 -07:00
Jeff Brown
b21b4fdcea
am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
...
* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
Dim the screen quickly in response to user activity timeout.
2012-10-24 14:58:26 -07:00
Jeff Brown
900e0ba516
Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
2012-10-24 14:55:41 -07:00
Jeff Brown
5244c93176
Dim the screen quickly in response to user activity timeout.
...
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.
Bug: 7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
2012-10-24 14:46:26 -07:00
Romain Guy
4344f20959
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:46 -07:00
Romain Guy
9933331506
Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
2012-10-24 13:50:45 -07:00
Baligh Uddin
229a22efc5
am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '188bf0e63c30fa557dc897faf1b55da045b23ca0':
Import translations. DO NOT MERGE
2012-10-24 13:50:23 -07:00
Baligh Uddin
188bf0e63c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 13:47:21 -07:00
Baligh Uddin
3dc0cb6e43
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 13:43:41 -07:00
Amith Yamasani
9bf572c2d3
am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
...
* commit 'cd668554417f089aa0ae013a29ab81864b4b4685':
Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:33:37 -07:00
Amith Yamasani
cd66855441
Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
2012-10-24 13:30:01 -07:00
Victoria Lease
1417167f1b
am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
...
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
revise android.location.Geofence documentation
2012-10-24 13:26:41 -07:00
Victoria Lease
f704e9f677
Merge "revise android.location.Geofence documentation" into jb-mr1-dev
2012-10-24 13:23:21 -07:00
Baligh Uddin
de18c8bf21
Import translations. DO NOT MERGE
...
Change-Id: I3717e675767f545d33b89efc85909a2d172808b8
Auto-generated-cl: translation import
2012-10-24 12:45:34 -07:00
Baligh Uddin
c5a1f8cd78
Import translations. DO NOT MERGE
...
Change-Id: I153e44f39a1bc197f1e0acca274239aee0404809
Auto-generated-cl: translation import
2012-10-24 12:44:10 -07:00
Christopher Tate
6eb0d77701
am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
...
* commit 'acf5943c44d34845386afe7946aed086f8b3e87e':
Fix the Backup Manager's uninstall tracking
2012-10-24 12:27:46 -07:00
Christopher Tate
acf5943c44
Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev
2012-10-24 12:24:51 -07:00
Daniel Sandler
be2cf3206e
Be a little more lenient with panel-open gestures.
...
The code would not consider any drag that did not complete
the "peek" distance (the distance the panel opens when you
press and hold on the status bar; on tablets this is
statusbarheight + closehandleheight, and on phones it's
headerheight + closehandleheight) as a candidate for a
fling, and set that drag's effective velocity to 0.
This CL just removes that check. Now a fling must meet the
minimum linear velocity and minimum Y distance thresholds
(100dp/sec and 20dp, respectively) to change the position of
the panel (closed->open or open->closed).
Bug: 7390976
Change-Id: Ia0c2450f9fdf3f27b890aab240a155dad1ab052f
2012-10-24 15:23:42 -04:00
Baligh Uddin
c832ca325f
am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
Import translations. DO NOT MERGE
2012-10-24 12:17:24 -07:00
Jeff Brown
b43269acdd
am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
Secure windows, secure surface views and secure displays.
2012-10-24 12:17:16 -07:00
Baligh Uddin
2171fa1cd3
am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
Import translations. DO NOT MERGE
2012-10-24 12:17:09 -07:00