Dianne Hackborn
a46a74fcd6
Merge "Remove extraneous logs." into jb-mr1-dev
2012-11-08 13:16:10 -08:00
Dianne Hackborn
7ff30113de
Remove extraneous logs.
...
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -08:00
Chris Wren
f080dc0c7d
am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
...
* commit '7d59cf9f10c38a020c7104e3bd5b358ab2144ab5':
allow pattern linear layout to manage message_area.
2012-11-08 13:09:08 -08:00
Jim Miller
6c7d2c248c
am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
...
* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
Don't show ECA in landscape mode on phones.
2012-11-08 13:08:45 -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
Adam Powell
2cfb9373fa
am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
...
* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
add bouncer frame to glowpad.
2012-11-08 13:08:38 -08:00
Daniel Sandler
3a54aaed02
am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
...
* commit '838195db8f69968690971977e4b615df39504465':
Compress lockscreen's account login fallback to fit.
2012-11-08 13:08:17 -08:00
Adam Powell
868edfdee6
am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
Fiddle with keyguard glowpad layouts
2012-11-08 13:08:06 -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
Chris Wren
e1a8eee6d0
allow pattern linear layout to manage message_area.
...
Bug: 7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
2012-11-08 12:28:15 -05:00
Jim Miller
e1a473b0d4
Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
2012-11-08 01:00:12 -08:00
Jim Miller
9e0a250600
Don't show ECA in landscape mode on phones.
...
Fixes bug 7490941
Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
2012-11-08 00:57:31 -08:00
Jim Miller
6be441c532
Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
2012-11-08 00:51:26 -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
Chris Wren
efbfa685b6
add bouncer frame to glowpad.
...
Bug: 7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
2012-11-07 23:29:17 -08:00
Daniel Sandler
838195db8f
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
2012-11-07 21:18:44 -08:00
Daniel Sandler
cf2b7a261d
Compress lockscreen's account login fallback to fit.
...
- ECA will not be shown in this mode
- The login button shares a row with the password field
Nice and tidy.
Bug: 7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
2012-11-08 00:09:37 -05: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
Adam Powell
3fbbbb66b6
Fiddle with keyguard glowpad layouts
...
Also add hierarchyviewer support for KeyguardSecurityView LayoutParams
Bug 7497272
Bug 7459668
Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
2012-11-07 20:47:23 -08:00
Jeff Brown
74da109102
Support Wifi display devices that rename themselves.
...
Some Wifi display devices like to rename themselves after a
connection completes (or at other times). Make sure to update
the name of the display when we detect that it changed in
our scan results.
This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.
Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.
Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
2012-11-07 18:43:32 -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
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
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
Joe Malin
8d40d04afa
Notification.java javadoc: addAction
...
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
2012-11-07 12:39:22 -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
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
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