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
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
Adam Powell
3c0a353a05
am 9799714f: Keyguard layout tweaking/reworking
...
* commit '9799714f6c69efe50e21a6073b879140e5e792b7':
Keyguard layout tweaking/reworking
2012-11-07 11:14:38 -08:00
Daniel Sandler
f74cac4699
am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
Updated assets.
2012-11-07 11:14:34 -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
Baligh Uddin
8dbf3b8df0
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-07 09:39:39 -08:00
Baligh Uddin
20040dafbc
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-07 09:38:43 -08:00
Chris Wren
cf9ee4c55d
Merge "Don't pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
2012-11-07 09:12:32 -08:00
Brian Colonna
275016703e
Centering FUL fixes b/7480608
...
A simple one-line change to center FUL horizontally. This looked
really bad on tablets when the charging text was showing as FUL was
obviously off-center compared to the text. It was also off-center
on phones, which looked particularly bad when going to the backup.
Change-Id: Id0e3039a67c9bb746a8c9948e82ff87b6c815e1b
2012-11-07 11:53:49 -05:00
Chris Wren
a042ac9064
Don't pop the IME for passwors at ScreenOn on tablets.
...
Change-Id: I4c157559b2a70021d55211607c1d62ba73adc590
2012-11-07 11:53:41 -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
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
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
