Chet Haase
b3975088b6
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:20 -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
Daniel Sandler
d85a960b14
Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
2012-10-25 11:59:53 -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
654761a059
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:45:06 -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
John Spurlock
2e8a98e269
Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
2012-10-25 11:40:12 -07:00
John Spurlock
dcc9681b0d
Manual frameworks/base merge from lockhotness (camera).
...
Change-Id: I8649ef77b706120a2297ddccd9bbb4d7ddf026a9
Proto-Id: Ia60ed9ee263b6053b9ca00d71fbd3ffc64a96278
2012-10-25 14:35:19 -04: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
e3b51ef002
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:28 -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
Daniel Sandler
c3fc322286
Fix Google Now on lockscreen.
...
We can't make the navbar slippery anymore if lockscreen is
going to intercept all the touches. :)
Bug: 7413021
Change-Id: I1658262e43c37d0b1a554cda434ac43c0a0a86c0
2012-10-25 13:28:33 -04: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
Daniel Sandler
c57f0d3e54
Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
2012-10-25 08:16:46 -07:00
Daniel Sandler
7bc8af3abc
Haptics for PIN enter key
...
Change-Id: Ie9d026847a6231b89cba55baf74e795f30ac857d
2012-10-25 11:13:18 -04:00
Daniel Sandler
40d98edb43
Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
2012-10-25 07:58:16 -07:00
Daniel Sandler
acb60fb577
Haptics for PIN keys.
...
Change-Id: I65b12a614f344faef140334658ec1e627094e05e
2012-10-25 10:46:37 -04:00
Bryan Mawhinney
661c2e7495
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:49 -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
Daniel Sandler
d5692742c1
PIN pad cosmetics.
...
Also pull the Klondike telephone exchange letter strings out
into arrays.xml so we can override it for specific locales.
Change-Id: Idf79ff8bfd53e5a8277271cc85ac7a1784ae3b64
2012-10-25 03:30:28 -04:00
Daniel Sandler
2c1ce0564f
Cleaning up password input.
...
Starting to try to show the IME at the right times.
Change-Id: Idc681304c309022666a03c26885a5c94ab4ec2a2
2012-10-25 01:30:00 -04:00
Daniel Sandler
51d39f2df9
Add ECA to PIN view
...
Change-Id: I46e854dc8d5920bb506ac9996af7ea3ca845468a
2012-10-25 01:18:30 -04:00
Jim Miller
df99b1d5d3
Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
2012-10-24 20:18:00 -07:00
Jim Miller
86f9637d7b
Fix new password view in keyguard
...
The IME wasn't coming up in password mode because the base class always
returned 'false' for needsInput().
Change-Id: Ia5bf508b3e08fa6980e83103322711857af74680
2012-10-24 20:14:47 -07:00
Michael Jurka
8b3dd40019
Fix build
2012-10-24 18:45:10 -07:00
Michael Jurka
147dfc8642
Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
2012-10-24 18:28:21 -07:00
Dianne Hackborn
db3efba6fc
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
5fbc82ef79
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:09 -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
Michael Jurka
aa2859ae61
Adding ability to add multiple widgets to keyguard
...
Bug: 7381803
2012-10-24 17:41:34 -07:00
Adam Powell
eee209313d
Beginnings of bouncer support; add scrims and state tracking
...
Integrating from prototype app
Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
2012-10-24 16:33:44 -07:00
Dianne Hackborn
b26306ad52
Fix issue #7408647 : Add getUserCount() API
...
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Irfan Sheriff
9253f56163
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:41 -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
2ca85c2051
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:28 -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
Adam Powell
c0657fb36c
Integrate changes from lockscreen proto app
...
Fix padding/layout issues in MultiPaneChallengeLayout
Change-Id: I610b4c0cc321a690fa29d071d6a960c05ffbe3a7
2012-10-24 14:01:37 -07:00
Romain Guy
ee0f615ffd
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:43 -07:00
Baligh Uddin
f785af4d2e
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-24 13:51:29 -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
a187b478b6
am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '188bf0e63c30fa557dc897faf1b55da045b23ca0':
Import translations. DO NOT MERGE
2012-10-24 13:50:22 -07:00
Baligh Uddin
188bf0e63c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 13:47:21 -07:00
Amith Yamasani
599885d530
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:38 -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
Chris Wren
f0cec427a4
Merge "remove debug logs." into jb-mr1-lockscreen-dev
2012-10-24 13:27:40 -07:00
Victoria Lease
405e6746c6
am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
...
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
revise android.location.Geofence documentation
2012-10-24 13:26:38 -07:00
Chris Wren
dc0d12278a
remove debug logs.
...
Change-Id: I8d0066bdce1c93c7a3da0fa36d865c674e5dcd40
Proto-Id: I7ac6b8c8a664dbd7abda089fcd9edb8d7ccc3208
2012-10-24 16:26:34 -04:00