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
1361758f90
Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
2012-11-06 23:31:49 -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
Adam Powell
9799714f6c
Keyguard layout tweaking/reworking
...
Teach KeyguardSecurityViewFlipper about layout_maxWidth/Height. Give
maxes to security views. Fix some IME layout weirdness in
SlidingChallengeLayout by adding more weirdness.
Change-Id: I8047d32302aad44844de06d54b150586b0861dab
2012-11-06 23:00:30 -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
Daniel Sandler
9edc48e263
Merge "Updated assets." into jb-mr1-lockscreen-dev
2012-11-06 21:14:13 -08:00
Daniel Sandler
fa61fc8532
Updated assets.
...
Change-Id: I4daaddb01c6156bdfacc5400886a6d7fc61d3ac0
2012-11-07 00:04:50 -05: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
Elliott Hughes
be8b47f6ce
It's 2012. We're always WITH_JIT.
...
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
2012-11-06 17:16:21 -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
7b9b41c18d
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:23 -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
Eino-Ville Talvala
e980adfd70
am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
Camera: Document new video snapshot picture size behavior.
2012-11-06 16:10:55 -08:00
Eino-Ville Talvala
688d98fe21
am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
Camera: Document new video snapshot picture size behavior.
2012-11-06 16:10:52 -08:00
Eino-Ville Talvala
4a1b6e4242
Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc
Dismiss error icon on setError(null) [regression]
...
Bug #7442935
Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
2012-11-06 16:03:37 -08:00
Romain Guy
a1ca6d39f9
am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1
am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:55:22 -08:00
Irfan Sheriff
511d5346ce
Stop supplicant and dhcp before start
...
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
2012-11-06 15:53:32 -08:00
Jean-Baptiste Queru
ecf372213d
Merge eead9274
...
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
2012-11-06 15:16:09 -08:00
Robert Greenwalt
08db1ceba2
am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
...
* commit 'bbe5cafeebbbd08516909a3d9d12d5d319cba345':
Add Coin graphic to premium-sms dialog.
2012-11-06 15:11:04 -08:00
Robert Greenwalt
bbe5cafeeb
Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
2012-11-06 15:07:35 -08:00
Jim Miller
088fb915f7
Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
2012-11-06 14:21:12 -08:00
Baligh Uddin
e5f4562ff7
Import translations. DO NOT MERGE
...
Change-Id: I76ae2d0dfa8538ffd649c69ed2aaa7128a29e2ea
Auto-generated-cl: translation import
2012-11-06 14:06:25 -08:00
Baligh Uddin
bc3a2b9f65
Import translations. DO NOT MERGE
...
Change-Id: I45d540fce163bd0eb6e2edbb6358a1aa6f50193b
Auto-generated-cl: translation import
2012-11-06 13:57:58 -08:00
Adam Cohen
0e1608c027
Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
2012-11-06 13:23:41 -08:00
Justin Koh
41048d670d
Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
2012-11-06 13:22:26 -08:00
Justin Koh
58e0fb9adb
Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
2012-11-06 13:20:51 -08:00
Amith Yamasani
aecee8a985
am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
...
* commit '717797db3e59ec34190e1230ebdeafecd14f4948':
Authenticate correct user's account when pattern fails multiple times.
2012-11-06 13:00:40 -08:00
Amith Yamasani
f763b71756
Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev
2012-11-06 12:56:17 -08:00
Jim Miller
bb9e7dcae9
am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'be2ca79abf2b1e5eb257560aa99ab48059e48cc8':
Workaround for layout bug in SIM PIN/PUK views
2012-11-06 12:48:26 -08:00
Winson Chung
5418dd92ac
am 6d47e9fc: am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660)
...
* commit '6d47e9fc867ece4340869f72d9484c9e5eb71873':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-06 12:48:06 -08:00
Adam Cohen
eead927499
am 4e8a47e0: am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev
...
* commit '4e8a47e01cd0fd409f998e00976b1249c6b2f963':
Fix small widgets not showing up on tablet (issue 7471516)
2012-11-06 12:47:58 -08:00
Winson Chung
6d47e9fc86
am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660)
...
* commit '48275d2de99ff2556031929c48f295d3f93447b6':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-06 12:43:52 -08:00
Adam Cohen
4e8a47e01c
am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev
...
* commit '79e0f875002d7bde5cf71053f9e9f054e9b5ffa2':
Fix small widgets not showing up on tablet (issue 7471516)
2012-11-06 12:43:46 -08:00
Adam Cohen
85a08f1bf2
Attempted fix for issue 7469415
...
Change-Id: Ica81bf4197dc2c4fadd8fa07cb9c895b55b5702b
2012-11-06 11:24:23 -08:00
Robert Greenwalt
a72b3aa034
Add Coin graphic to premium-sms dialog.
...
bug:7205024
bug:7180681
Change-Id: Iece09d89598aefc5fd879587c65e5b179569e8e5
2012-11-06 10:53:15 -08:00
Jim Miller
7dfc588a9d
Workaround for layout bug in SIM PIN/PUK views
...
This prevents a degenerate layout while we figure out what's
going on.
Change-Id: I99d1c6e5ce59fd48a74258158208270b775c1511
2012-11-05 22:45:35 -08:00
Jim Miller
bfec0a8616
Add isSafeModeEnabled() API to WindowManagerService
...
This adds a means of determining when the device is in safe mode,
as required by keyguard to disabled some features.
Change-Id: I31d357e6738c92e1837f9e0263e5f3f4de66315a
2012-11-05 20:27:38 -08:00
Amith Yamasani
2c7bc26a74
Authenticate correct user's account when pattern fails multiple times.
...
Bug: 7473142
Provide hidden methods in AccountManager for querying accounts and
authenticating for a specific user. Lockscreen is running in the
system process. Allow only system process to access accounts across
users.
Also make sure to launch the lock settings screen on the just reset
user using startActivityAsUser()
Change-Id: Ifefc0039ba2b51396b8bd0268f36d5271a3d8676
2012-11-05 18:17:40 -08:00
Svetoslav Ganov
9d45666119
am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'c9300f196335410483c5c07eccac620332b75def':
View's visibility to the user not checking predecessor alpha.
2012-11-05 17:08:46 -08:00
Mike Cleron
21c2525441
am a0362c7b: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'a0362c7b17ade27103ab468e46fb00de002ce6fa':
TextView not respecting "speak passwords" setting when adding before text to events.
2012-11-05 17:08:42 -08:00
Svetoslav Ganov
c9300f1963
am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit '0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
View's visibility to the user not checking predecessor alpha.
2012-11-05 17:06:25 -08:00