Jim Miller
a2bf6181df
am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:13:23 -08:00
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
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
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
2c29deaa26
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:08:41 -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
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
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
Jim Miller
4eeb4f664a
Add mechanism to kick keyguard to show the assistant
...
Fixes bug 7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
2012-11-08 00:39:04 -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
Justin Koh
cd38c32d85
Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
2012-11-07 17:10:24 -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
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
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
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
Michael Jurka
c70379347e
am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:14:45 -08:00
Adam Cohen
96c3f7e5f2
am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '1361758f90e3c247e2da953913ef424041d1c847':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-07 11:14:41 -08:00
Michael Jurka
1aad5be916
am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit '835579e8173700be78368827d5c042ac4f698e29':
Removing sticky widgets in lockscreen
2012-11-07 11:14:24 -08:00
Jim Miller
259e3121d3
am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '51117262c8fadb6d227d137e83ad66996b013141':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:14:14 -08:00
Jim Miller
fe7e94a094
am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-07 11:13:48 -08:00
Adam Cohen
a7af02098a
am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
Attempted fix for issue 7469415
2012-11-07 11:13:34 -08:00
Daniel Sandler
8768278974
Fix docs to refer to the correct class.
...
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
2012-11-07 14:04:42 -05:00
Satoshi Kataoka
8b117c8578
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
...
Bug: 7393485
Currently, the extract text view blinks at the transition of InputMethodService.
This change reduces this blinking by making the extract text view invisible when the extract text view is hidden.
Change-Id: I9af96058283a9a5b60707d025ad1abbbbc23c16f
2012-11-07 22:03:55 +09:00
Michael Jurka
cabcc59007
Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2
Allowing rotation while adding lockscreen widgets
...
Also cleaning up some unused code
Bug: 7468012
2012-11-07 01:12:26 -08:00
Adam Cohen
e41dd0f195
Giving glow pad the brains to scale itself dynamically (issue 7449554)
...
Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8
2012-11-06 23:06:44 -08:00
Jim Miller
a976860962
Attempt to fix NegativeArraySizeException crash in keyguard
...
Fixes bug 7490924
Change-Id: I974c9b7a4fb3de536efe9d47cdd480190772a1be
2012-11-06 22:17:25 -08:00
Michael Jurka
76017cad4f
Removing sticky widgets in lockscreen
...
Also adding mechanism to show a widget after
adding it
Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
2012-11-06 18:56:41 -08:00
Irfan Sheriff
f264e8e34e
am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
...
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
2012-11-06 17:43:05 -08:00
Irfan Sheriff
567a2919f3
Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
2012-11-06 17:39:46 -08:00
Romain Guy
a76f7db323
Respond to ticks when a timezone is set and it doesn't display seconds
...
Bug #7489774
This change also fixes a crash if you programmatically set the time
formats from code before the widget is attached to the window.
Change-Id: I73ead93f5866d9059a4b3823c4304aeca8e419b6
2012-11-06 17:35:23 -08:00
Jim Miller
51117262c8
Handle DevicePolicyManagement and safe mode when inflating widgets
...
Bug 7459120
Bug 7444159
Bug 7444016
Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
2012-11-06 17:04:26 -08:00
Romain Guy
b37e5d756f
am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
...
* commit '7b9b41c18d0dc9d238111fa1865c72e4a5bb22cc':
Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-06 16:21:05 -08:00
Romain Guy
475255bffc
am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
...
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-06 16:18:19 -08:00
Romain Guy
1b3b2544e6
Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
9671e6e116
am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit 'e980adfd7085e99e57722e5576798c0ccdfb3f20':
Camera: Document new video snapshot picture size behavior.
2012-11-06 16:13:42 -08:00