Irfan Sheriff
b31a6d7824
Merge "Improve wps pincode input"
2012-06-13 12:00:35 -07:00
Chris Craik
14584f1b6d
am 06d6204a: am d772c487: Merge "Fix attachFunctor path to ignore delay" into jb-dev
...
* commit '06d6204a2ea7dd263b718018dbb81a88b9a516d5':
Fix attachFunctor path to ignore delay
2012-06-13 10:49:02 -07:00
Chris Craik
06d6204a2e
am d772c487: Merge "Fix attachFunctor path to ignore delay" into jb-dev
...
* commit 'd772c4878e2207795e92b26a462fd02bca7e3c2e':
Fix attachFunctor path to ignore delay
2012-06-13 10:43:19 -07:00
Chris Craik
d772c4878e
Merge "Fix attachFunctor path to ignore delay" into jb-dev
2012-06-13 10:34:59 -07:00
Daniel Sandler
eb859df3f9
am e63d952a: am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
...
* commit 'e63d952a9294c1257598edc13b3457b7a0d81e63':
"Two actions ought to be enough for anybody."
2012-06-13 07:14:31 -07:00
Daniel Sandler
e63d952a92
am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
...
* commit '7d2e8960d0fcebf924c60dbd0f6934368ceb80e3':
"Two actions ought to be enough for anybody."
2012-06-13 07:10:03 -07:00
Daniel Sandler
7d2e8960d0
Merge ""Two actions ought to be enough for anybody."" into jb-dev
2012-06-13 07:07:02 -07:00
Jim Miller
505bfd0c3d
am 84f13daf: am cbf026fc: Fix 6641800: Remove unnecessary padding below status view
...
* commit '84f13dafa9a837087e515f791aeef7cd5c216046':
Fix 6641800: Remove unnecessary padding below status view
2012-06-12 20:24:07 -07:00
Jim Miller
84f13dafa9
am cbf026fc: Fix 6641800: Remove unnecessary padding below status view
...
* commit 'cbf026fc1f595c4e13d411bc61d5008eaf7b460c':
Fix 6641800: Remove unnecessary padding below status view
2012-06-12 20:20:06 -07:00
Jim Miller
cbf026fc1f
Fix 6641800: Remove unnecessary padding below status view
...
This fixes a bug on a 600dp device where the owner info text
was clipped.
Change-Id: I5293b6c1f508307dc55b23d6e2f219e9fa735693
2012-06-12 19:56:34 -07:00
Jim Miller
79cb9b52e8
am 5f190731: am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design.
...
* commit '5f1907316e0085073a314dcfa41bfb35a7f31f9f':
Fix 6613962: Update keyguard to use new GlowPadView UX design.
2012-06-12 19:47:37 -07:00
Jim Miller
5f1907316e
am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design.
...
* commit '955a016922ea49f154d190b054a202559b41a4d3':
Fix 6613962: Update keyguard to use new GlowPadView UX design.
2012-06-12 19:41:44 -07:00
Jim Miller
955a016922
Fix 6613962: Update keyguard to use new GlowPadView UX design.
...
Change-Id: I4f1ef3107e5550f7df9dcb412943a84b66432b7d
2012-06-12 19:16:08 -07:00
Jeff Sharkey
554259fe02
am 9eabf916: am f6f7f1d2: Low disk space string change, surface state.
...
* commit '9eabf916dc5d53bc6c765d39cca0847993e73dcf':
Low disk space string change, surface state.
2012-06-12 18:40:24 -07:00
Jeff Sharkey
9eabf916dc
am f6f7f1d2: Low disk space string change, surface state.
...
* commit 'f6f7f1d2dc6e8fad5d6ff9a56af9929488873b4f':
Low disk space string change, surface state.
2012-06-12 18:36:07 -07:00
Amith Yamasani
b8151ecd6e
Add an icon to the user information.
...
Store the icon in the user folder under /data/system,
similar to how the wallpaper is stored.
Change-Id: Id8ccb55b9e2ba7b4c557505a7f69f04eca1518cf
2012-06-12 18:18:29 -07:00
Chris Craik
cb82b942c8
Fix attachFunctor path to ignore delay
...
Don't defer functor invocation when calling attach functor directly.
bug:6653638
Change-Id: Ifffc027df16612f380f39b82b7d0a4411d53b4ea
2012-06-12 17:55:18 -07:00
Jeff Sharkey
f6f7f1d2dc
Low disk space string change, surface state.
...
Surface current low disk state through IPackageManager for use in
Settings app.
Bug: 6576409
Change-Id: I9ae9ce99a2faa3015a237036c03567d1ae11628f
2012-06-12 17:12:08 -07:00
George Mount
1c1ca050e1
Merge "Hide handles when clipped by layer or edit region."
2012-06-12 16:58:40 -07:00
Yoshihiko Ikenaga
60879bd92d
Improve wps pincode input
...
Limit the length and input style of wps pin.
Change-Id: I60bd93322f683085424c9ac9c35ce9e0bb99f26c
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-06-12 16:51:33 -07:00
Jeff Brown
f69eef1b63
am b8b29fa7: am fdcac45b: Merge "Print extended SQLite error code." into jb-dev
...
* commit 'b8b29fa7f18dd36bacc97d6c471935cb95e4c18c':
Print extended SQLite error code.
2012-06-12 16:13:41 -07:00
Jeff Brown
b8b29fa7f1
am fdcac45b: Merge "Print extended SQLite error code." into jb-dev
...
* commit 'fdcac45b6767caaac70c30fd974dce61119f79d7':
Print extended SQLite error code.
2012-06-12 16:09:34 -07:00
George Mount
9b6eb6939e
Hide handles when clipped by layer or edit region.
...
Bug 6590742
Separated base and extent handle alpha so that they can
be hidden individually. Added visiblity check and animations
to show and hide the handles.
Change-Id: I08ce7f870bbb8e059550797afa18c2db39394caf
2012-06-12 16:08:20 -07:00
Jeff Brown
fdcac45b67
Merge "Print extended SQLite error code." into jb-dev
2012-06-12 16:06:03 -07:00
Jeff Brown
ca309f212d
Print extended SQLite error code.
...
Bug: 6538393
Change-Id: I2b010c6a1127887717af67ec588c3df8bf41afe6
2012-06-12 15:39:09 -07:00
Romain Guy
95fc7a246f
Merge "Remove ViewTreeObserver allocations"
2012-06-12 15:27:06 -07:00
Romain Guy
c39ed4a6e5
Remove ViewTreeObserver allocations
...
A couple of allocations remain to handle possibly recursive listeners.
Change-Id: I72fd271c2fc4f4ad427a27e0665f780cae117aea
2012-06-12 15:23:52 -07:00
Ying Wang
762b3b143c
Merge "Import translations. DO NOT MERGE"
2012-06-12 13:33:04 -07:00
Ying Wang
aafad2ef42
Import translations. DO NOT MERGE
...
Change-Id: I382cf1aff2a8939ed276f4169ec7b853d0c981ac
2012-06-12 13:28:08 -07:00
Ying Wang
fbd982c14f
am 9c463d9d: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9c463d9d9f2601f139baad862b1b3276e126b12d':
Import translations. DO NOT MERGE
2012-06-12 13:22:27 -07:00
Ying Wang
9c463d9d9f
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-12 13:20:19 -07:00
Ying Wang
26879578e8
Import translations. DO NOT MERGE
...
Change-Id: Iafceb53cc46753f25f460609e9db6fa227c15032
2012-06-12 13:17:59 -07:00
Daniel Sandler
602ad1c978
"Two actions ought to be enough for anybody."
...
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
2012-06-12 16:06:27 -04:00
Adam Powell
49a0b01bdc
am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev
...
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
MediaRouter work
2012-06-12 13:01:30 -07:00
Gilles Debunne
30103f6698
am 735b9598: am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev
...
* commit '735b9598a2c7824befbdfc55ef4991ca01550d84':
Prevent a crash when maxLines is set to 0
2012-06-12 13:01:15 -07:00
Dianne Hackborn
5ef59976b1
am f59467b3: am aabd9c23: Merge "Fix issue #6634325 : View.setKeepScreenOn and..." into jb-dev
...
* commit 'f59467b3d6c5df8bf90de799e212275e5c26de86':
Fix issue #6634325 : View.setKeepScreenOn and...
2012-06-12 13:01:12 -07:00
Jeff Brown
d3f97dc0fb
am 14afbba6: am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev
...
* commit '14afbba66355fab168bed25c9bab33058372584a':
Improve ANR diagnostics.
2012-06-12 13:01:06 -07:00
Dianne Hackborn
d4a0c49ffa
am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
...
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
Rework media router to be per-context with global process state.
2012-06-12 13:00:47 -07:00
Jeff Brown
2dc7232140
am 62007aba: am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev
...
* commit '62007aba1998055cf6ab3e610ed97dbe06341056':
Detect bad behavior earlier in Choreographer.
2012-06-12 13:00:40 -07:00
Victoria Lease
49ccb116e9
am 1b15102f: am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
...
* commit '1b15102fc040f59c72c6453dee15b791f54c9f06':
Revert "Fix fake bold for fallback fonts in frameworks."
2012-06-12 13:00:37 -07:00
Adam Powell
ea99d9af2d
am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
...
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
Further work on MediaRouter
2012-06-12 13:00:33 -07:00
Romain Guy
bc62684f02
am 265888fe: am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807 " into jb-dev
...
* commit '265888fe6a57d5b77279c97b68cfa25865267e6b':
Prevent crash in WebView when disabling the hw renderer Bug #6596807
2012-06-12 13:00:28 -07:00
Svetoslav Ganov
23ef5fcff4
am 5d15f40a: am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev
...
* commit '5d15f40a19be01fa9c5a9674b31b6b18774cbeac':
NPE when iterating by character and word in Launcher widgets.
2012-06-12 13:00:25 -07:00
Dianne Hackborn
b1add0b8f2
am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368 : can\'t launch gallery" into jb-dev
...
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
Fix issue #6641368 : can't launch gallery
2012-06-12 13:00:15 -07:00
Chia-chi Yeh
7c727e50f1
am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
...
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
VPN: move VpnDialogs away from system uid.
2012-06-12 12:59:59 -07:00
Amith Yamasani
82f47c95b6
Merge "Disable lockscreen using a system property."
2012-06-12 12:57:18 -07:00
Adam Powell
0d637d6f88
am 579ec308: Merge "MediaRouter work" into jb-dev
...
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
MediaRouter work
2012-06-12 12:46:02 -07:00
Gilles Debunne
735b9598a2
am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev
...
* commit 'a447eaca555e45ebbbc5e4de2762e19dbca12980':
Prevent a crash when maxLines is set to 0
2012-06-12 12:45:27 -07:00
Dianne Hackborn
f59467b3d6
am aabd9c23: Merge "Fix issue #6634325 : View.setKeepScreenOn and..." into jb-dev
...
* commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5':
Fix issue #6634325 : View.setKeepScreenOn and...
2012-06-12 12:45:24 -07:00
Jeff Brown
14afbba663
am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev
...
* commit 'ea6b8188320202da072285b08fe6c0ee5c3f71e5':
Improve ANR diagnostics.
2012-06-12 12:43:52 -07:00