Jim Miller
3a191b495c
am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'f3add313dcbcda6711b441022fe340b412b7d1a0':
Attempt to fix NegativeArraySizeException crash in keyguard
2012-11-08 13:12:25 -08:00
Winson Chung
29f161781c
am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '27ed0c2d002587010456c87321902c276ae6e11a':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:12:17 -08:00
Adam Cohen
79d4bf6e2f
am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit 'efacf14349286916d7dfd904617cda659f93cf91':
Fixing up overscroll asset / sizing
2012-11-08 13:12:13 -08:00
Svetoslav Ganov
8fa69381f2
am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
...
* commit '0e538548d75b97cfb3f29cce9c39e0ba65bbaa46':
Slide unlock cannot get accessibility focus.
2012-11-08 13:12:06 -08:00
Jim Miller
bb01e9b82f
am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'b1938777afd8d7888779102ea2f3b5c0077c8f88':
Implement fallback clock in keyguard
2012-11-08 13:12:02 -08:00
Adam Cohen
24b1764e6c
am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '9477f8dee1068f7b07713a33b18fd4aea6b5c039':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 13:11:54 -08:00
Jim Miller
f3add313dc
am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
...
* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
Attempt to fix NegativeArraySizeException crash in keyguard
2012-11-08 13:07:46 -08:00
Winson Chung
27ed0c2d00
am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349
am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
Fixing up overscroll asset / sizing
2012-11-08 13:07:36 -08:00
Svetoslav Ganov
0e538548d7
am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
...
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
Slide unlock cannot get accessibility focus.
2012-11-08 13:07:29 -08:00
Jim Miller
b1938777af
am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
Implement fallback clock in keyguard
2012-11-08 13:07:25 -08:00
Adam Cohen
9477f8dee1
am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 13:07:18 -08:00
Satoshi Kataoka
4424951fa5
am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
...
* commit '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8
Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
2012-11-07 20:48:01 -08:00
Jim Miller
3c9297c3cb
Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 18:09:14 -08:00
Winson Chung
4181e8a4ac
Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
2012-11-07 17:50:24 -08:00
Winson Chung
c065a5d727
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
...
- Laying out the drop target without padding from the multiuser picker
Change-Id: Icd3528a13f84a789341a841645bfde4e51fd1747
2012-11-07 17:44:42 -08:00
Justin Koh
cd38c32d85
Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
2012-11-07 17:10:24 -08:00
Adam Cohen
85c4281aae
Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
2012-11-07 17:08:31 -08:00
Adam Cohen
d51700b3cc
Fixing up overscroll asset / sizing
...
-> No more jaggies! yay (issue 7459049)
-> Fixed up weird overscroll state (issue 7489094)
Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
2012-11-07 16:54:35 -08:00
Svetoslav Ganov
cd1f309505
Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
2012-11-07 16:39:21 -08:00
Jim Miller
4096288022
Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 16:05:46 -08:00
Jim Miller
edc74abf8a
Implement fallback clock in keyguard
...
This clock is shown if widgets are ever disabled by DPM and the
default clock package is not enabled.
Fixes bug 7469367
Change-Id: I8cf140c0fc00dd56265e3a332aff2fe3b41e3ec0
2012-11-07 15:58:47 -08:00
Svetoslav Ganov
7ce0c13c0e
Slide unlock cannot get accessibility focus.
...
1. There are two overlaid views, one is the GlowPadView and the
other is the SlidingChallengeLayout. Since the GlowPadView is
on top of the other view it has to consume the hover events or
they will be dispatched to the view behind it which results
the the GlowPadView not getting accessibility focus.
bug:7496770
Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
2012-11-07 15:55:02 -08:00
Ben Pietrzak
6b1d912b25
Catch exception of nonfound activities
...
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
2012-11-07 15:07:18 -08:00
Adam Cohen
3e66286f7c
Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae
Fixing up glowpad scaling issues (issue 7494378)
...
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
2012-11-07 14:43:33 -08:00
Daniel Sandler
ccbfd617e7
am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
Fix docs to refer to the correct class.
2012-11-07 12:40:30 -08:00
Daniel Sandler
7b5a92766a
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81
Merge "Fix docs to refer to the correct class." into jb-mr1-dev
2012-11-07 12:35:01 -08:00
Baligh Uddin
0d29833f96
am 32226b73: Import translations. DO NOT MERGE
...
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
Import translations. DO NOT MERGE
2012-11-07 11:57:36 -08:00
Baligh Uddin
32226b73ca
Import translations. DO NOT MERGE
...
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
2012-11-07 11:54:30 -08:00
Baligh Uddin
658e350daf
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-07 11:33:07 -08:00
Baligh Uddin
d5ef55df10
Import translations. DO NOT MERGE
...
Change-Id: Ia17c77e31bea23907d9d28a0d12acf4ed9040eb6
Auto-generated-cl: translation import
2012-11-07 11:31:14 -08:00
Romain Guy
de60dd2d13
am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit 'fcd7ad4e28df6a408e84c6d2b2f425b029efbfbe':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-07 11:22:43 -08:00
Romain Guy
fcd7ad4e28
am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-07 11:18:55 -08:00
Chris Wren
193cd46c47
am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
...
* commit '53d819687e29ea8b400f4852295fbec3fabb9f7b':
Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-07 11:18:21 -08:00
Brian Colonna
1e85c8edfb
am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
...
* commit '9885568eb7b85f743ff7c8a1503251a54ed9ea73':
Centering FUL fixes b/7480608
2012-11-07 11:18:17 -08:00
Michael Jurka
5dc8ce48d8
am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit 'c70379347e2a1bc469da10149f8d443ab7c94468':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:18:06 -08:00
Adam Cohen
580657a348
am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '96c3f7e5f21c6b38d00dd259941d8c72c2283160':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-07 11:18:03 -08:00
Adam Powell
e7394d1eef
am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
...
* commit '3c0a353a05555819394d74795b9825c7210c3e1d':
Keyguard layout tweaking/reworking
2012-11-07 11:17:59 -08:00
Daniel Sandler
f6a5070bf5
am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'f74cac46991cb46dc6e80a02f0c3a83dc5ed12ed':
Updated assets.
2012-11-07 11:17:55 -08:00
Michael Jurka
f142427244
am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit '1aad5be9161397db505c2812c1a8279421c245c3':
Removing sticky widgets in lockscreen
2012-11-07 11:17:43 -08:00
Jim Miller
8920c259c8
am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '259e3121d301c29112dad028931d9d477264be96':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:17:33 -08:00
Jim Miller
c7dc250d5a
am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-07 11:17:08 -08:00
Adam Cohen
d50f206a08
am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit 'a7af02098a0192b36e98c5ab809fd0f6eae9ce21':
Attempted fix for issue 7469415
2012-11-07 11:16:57 -08:00
Romain Guy
59d73ab6fc
Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774 " into jb-mr1-dev
2012-11-07 11:15:36 -08:00
Baligh Uddin
b38b3ed123
am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '8dbf3b8df0f29d457155e5831dbecf5ba4fff98e':
Import translations. DO NOT MERGE
2012-11-07 11:15:00 -08:00
Chris Wren
53d819687e
am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
...
* commit 'cf9ee4c55db750f86fdcb765c4f21c44bb4bc893':
Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-07 11:14:56 -08:00
Brian Colonna
9885568eb7
am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
...
* commit '6b4ab7f170ea54e5b99cf0635d3803a9407439d7':
Centering FUL fixes b/7480608
2012-11-07 11:14:53 -08:00