git.osdn.net Git - android-x86/frameworks-base.git/log

Baligh Uddin [Mon, 29 Oct 2012 22:12:28 +0000 (15:12 -0700)]

am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'c86c4ae693d13f467807cbd8c3aa2025045018c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:08:52 +0000 (15:08 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 22:05:07 +0000 (15:05 -0700)]

am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit '7fd412767c063ccd2d80a3db6a0d27cf0ff6d261':
Fix for some downloaded apps showing up on all users

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:05:06 +0000 (15:05 -0700)]

am 34a1e0dd: (-s ours) am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '34a1e0dda8d6f728e9c324e1e25e3844ec91e4b1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 22:02:32 +0000 (15:02 -0700)]

am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit '7c258505ecfbf726c56814963bee798e74ff4cb4':
Fix for some downloaded apps showing up on all users

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:57:20 +0000 (14:57 -0700)]

Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:54:29 +0000 (14:54 -0700)]

am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f64e70fd045c2a786e3d3edf880d806e93beec3b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:51:40 +0000 (14:51 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:50:30 +0000 (14:50 -0700)]

am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:47:41 +0000 (14:47 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:31:08 +0000 (14:31 -0700)]

am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '629a90cf55cd6aa2e326dfdae2142e2b7e156731':
FusedLocation runs per user as user

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:31:05 +0000 (14:31 -0700)]

am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit '4f5561b71007f0b27f6bb385e7a7f4f67c88ed75':
Revert "make FLP play nicely with multiuser"

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 21:31:01 +0000 (14:31 -0700)]

am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit 'b20dae4a8d63f28bbb6ae8c55f191cc52dd7dc47':
Fix handling escaped chars in ssid

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]

am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'ed6192f7010b37e5252c9a409cb07ce75bb12d36':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]

am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '7ca0dc50ded270ea0a4d3b0b9ec1b5609a51465f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:23:56 +0000 (14:23 -0700)]

am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '9531b1c4889dfb30897eabd4db95364e1f316f44':
Don't scale screen brightness by electron beam level.

commit | commitdiff | tree

Dirk Dougherty [Mon, 29 Oct 2012 21:23:52 +0000 (14:23 -0700)]

am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting.

* commit 'f1d7dc730fc2fb8a9e5c913fb61df82b9d9104eb':
Doc change: fix some table formatting.

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 21:23:48 +0000 (14:23 -0700)]

am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '67baf8781bbf7cb70c0570ab3b3370265c9c7369':
add settings for dock audio enabled

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:43 +0000 (14:23 -0700)]

am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev

* commit '9d662c77650a1cee9d05ad93743684482eeba935':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:23:38 +0000 (14:23 -0700)]

am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev

* commit 'cee171409b4145876328f62823277e35387e66e4':
make FLP play nicely with multiuser

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:23:29 +0000 (14:23 -0700)]

am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout

* commit 'daa7218a9ea4e0d48e4cecf96540e53f2e3d8945':
Fix measurement bug in keyguard/MultiPaneChallengeLayout

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:23:24 +0000 (14:23 -0700)]

am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev

* commit '91885b5528ee1b8fec4db08a402eb90a36a84776':
Keyguard - prevent slider intercept when we don't want it

commit | commitdiff | tree

Winson Chung [Mon, 29 Oct 2012 21:23:20 +0000 (14:23 -0700)]

am 69d0686f: am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev

* commit '69d0686fdc20e95bd86079f6368acd4affb07b88':
Making the PagedView full screen on tablets.

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 21:23:16 +0000 (14:23 -0700)]

am ffeb45a8: am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev

* commit 'ffeb45a8e579e328e30920426adb9d70c78346a4':

commit | commitdiff | tree

Adam Cohen [Mon, 29 Oct 2012 21:23:12 +0000 (14:23 -0700)]

am 40011d6f: am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev

* commit '40011d6fef363e4cdc9c90ba3139e9199801c786':
3D carousel initial stab -- paging outlines / alpha effects pending design

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 21:23:08 +0000 (14:23 -0700)]

am 18b5b1f4: am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev

* commit '18b5b1f46298ad35398d8ba3dbd3156ad14296e6':
Fix bug where it wasn't possible to add widgets

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:23:05 +0000 (14:23 -0700)]

am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit 'de264c6d18a7b68c0f2f7f1a27ab8c8b31e7f39d':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:01 +0000 (14:23 -0700)]

am bb0e7645: am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev

* commit 'bb0e76453b9a9a1947ac91a7af6cd6c657cbbe32':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:22:56 +0000 (14:22 -0700)]

am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

* commit 'b6fcfdb890b3460453708dbf38d5c20befa98383':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:22:53 +0000 (14:22 -0700)]

am 7587e2a8: am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev

* commit '7587e2a8455cdcd4a739877825cd0286347e0e28':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:22:48 +0000 (14:22 -0700)]

am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev

* commit 'a5b74cc4c911d533a8c7784b4f0bbdf22cfee25f':
Fix lockscreen slider bugs

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 21:22:44 +0000 (14:22 -0700)]

am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev

* commit 'e25974c347e29221bfaa9ce071797469f0bfc4f4':
Implement "sticky" widget logic.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:22:38 +0000 (14:22 -0700)]

am 3d6438c8: am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev

* commit '3d6438c89448341416a4da705d35338626d72c90':
Make the add widget button hitrectangle smaller.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:22:33 +0000 (14:22 -0700)]

am cc3e894a: am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev

* commit 'cc3e894a99e9479512f40c30ed0c782dcb021539':
Remove the handle headroom if the challenge is open.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:22:29 +0000 (14:22 -0700)]

am a84d353c: am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev

* commit 'a84d353c772c3e2bdec4b2f36f6822ee62d117ed':
Expand top of touchable area of challenge drag handle.

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 21:22:25 +0000 (14:22 -0700)]

am f04a6ee7: am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev

* commit 'f04a6ee7058a65cc1d2e24c5e572eb03b4914ed0':
Update swipe edge size to match ux prototype.

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 21:22:18 +0000 (14:22 -0700)]

am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev

* commit 'e1ea4d35d3abc05f2cd7bd961373ef164caf2a5b':
Fix issue #7419050: Time is not getting updated after launching Clock

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:22:11 +0000 (14:22 -0700)]

am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit '16f18a4ce879c53a06cffc552a5d25e73bed5327':
Fix the user name for the owner.

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:22:04 +0000 (14:22 -0700)]

am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev

* commit 'dd80335edde688794db3260bcea7f732430abaf1':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:12:28 +0000 (14:12 -0700)]

am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '83f60c5247ba60b6aa536b2d8191df9289102600':
FusedLocation runs per user as user

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:12:25 +0000 (14:12 -0700)]

am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit '167282f19f58ba5271c37bb16c4ea5bcd0bf6303':
Revert "make FLP play nicely with multiuser"

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 21:12:19 +0000 (14:12 -0700)]

am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
Fix handling escaped chars in ssid

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:12:04 +0000 (14:12 -0700)]

am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'dbcec903c858b65c78620e2b06238e42ff4d12da':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:12:00 +0000 (14:12 -0700)]

am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2407ed15318453e5284153477453a94f19c324f4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:11:56 +0000 (14:11 -0700)]

am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '99e88721a8bd19f04278e2fdccd224fc7ee705d4':
Don't scale screen brightness by electron beam level.

commit | commitdiff | tree

Dirk Dougherty [Mon, 29 Oct 2012 21:11:46 +0000 (14:11 -0700)]

am 7b9a2889: Doc change: fix some table formatting.

* commit '7b9a28892b1821a657bc9de5245528557d15a154':
Doc change: fix some table formatting.

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 21:02:31 +0000 (14:02 -0700)]

am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
add settings for dock audio enabled

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:01:51 +0000 (14:01 -0700)]

am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev

* commit '68b14054b96571d4009c6c5a9b4c3413d908a523':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:01:47 +0000 (14:01 -0700)]

am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev

* commit '319c7e85019350e3a5f26c64803900b945130c3b':
make FLP play nicely with multiuser

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:01:44 +0000 (14:01 -0700)]

am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout

* commit '0a27c4865e5f3afe891680f687ac75c6a659fb84':
Fix measurement bug in keyguard/MultiPaneChallengeLayout

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:01:36 +0000 (14:01 -0700)]

am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev

* commit 'b0ed8bdb41cff76f31ce47f1ae7ee51ea68bba47':
Keyguard - prevent slider intercept when we don't want it

commit | commitdiff | tree

Winson Chung [Mon, 29 Oct 2012 21:01:32 +0000 (14:01 -0700)]

am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev

* commit '113ca64a2275ad05c1429edcf56c688d823e308a':
Making the PagedView full screen on tablets.

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 21:01:26 +0000 (14:01 -0700)]

am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev

* commit '8905923c63b73deecb82567f16404b2cf90de8cc':

commit | commitdiff | tree

Adam Cohen [Mon, 29 Oct 2012 21:01:20 +0000 (14:01 -0700)]

am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev

* commit '8daee807532861239740a31689255fddf11574c1':
3D carousel initial stab -- paging outlines / alpha effects pending design

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 21:01:10 +0000 (14:01 -0700)]

am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev

* commit 'a15eeacff99650cb9151106438fb61b73d4e749a':
Fix bug where it wasn't possible to add widgets

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:01:07 +0000 (14:01 -0700)]

am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit '369f1c92e7cc1fba13b04698fb310fded1a85eda':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:01:03 +0000 (14:01 -0700)]

am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev

* commit 'b8a220cbef4bc6a3af327fce51d59aacd91a9935':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:01:00 +0000 (14:01 -0700)]

am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

* commit 'd3d523da9a9906beb78c1fd9fa90dac7ea10e5ad':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:00:56 +0000 (14:00 -0700)]

am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev

* commit 'a41ca127a6bb81ce4f660bda25d62105fba6de3a':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:00:53 +0000 (14:00 -0700)]

am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev

* commit '942a60d8a40a55b94ce443a71e7dc632911f0e84':
Fix lockscreen slider bugs

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 21:00:48 +0000 (14:00 -0700)]

am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev

* commit '011717d0648878eedec9e6de90b8fba12f550df7':
Implement "sticky" widget logic.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:00:43 +0000 (14:00 -0700)]

am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev

* commit '1f887cb2928695c81df9cfbbb730225ee81051dd':
Make the add widget button hitrectangle smaller.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:00:39 +0000 (14:00 -0700)]

am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev

* commit '61426f3d83f329ae76a226ea614541db9eb16bcb':
Remove the handle headroom if the challenge is open.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 21:00:36 +0000 (14:00 -0700)]

am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev

* commit 'c9a7d9899908a3f5960cfe6123d51cfbfcf2b0ae':
Expand top of touchable area of challenge drag handle.

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 21:00:32 +0000 (14:00 -0700)]

am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev

* commit 'af5b49c12dc2ff83b3d43663f4fda09401fb7d3f':
Update swipe edge size to match ux prototype.

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 20:56:01 +0000 (13:56 -0700)]

am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev

* commit '8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
Fix issue #7419050: Time is not getting updated after launching Clock

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 20:55:57 +0000 (13:55 -0700)]

am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit '084824548f9706db8356ed4480c282288ffc0bd0':
Fix the user name for the owner.

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 20:55:46 +0000 (13:55 -0700)]

am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev

* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode

commit | commitdiff | tree

Justin Koh [Mon, 29 Oct 2012 20:37:17 +0000 (13:37 -0700)]

am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev

* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
Expose PreferenceManager constructor / Preference#performClick

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 20:37:10 +0000 (13:37 -0700)]

am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
Add MediaRouter API to get presentation display.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:37:07 +0000 (13:37 -0700)]

am 6b2d4196: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev

* commit '6b2d41966ad7970d0dd4a891fbf41641514df418':
Final icon for (Day)dreams.

commit | commitdiff | tree

Chris Wren [Mon, 29 Oct 2012 20:36:59 +0000 (13:36 -0700)]

am 592f6343: am f0fd172a: lock out clicks while switching.

* commit '592f6343726b61ad199236ccf6077941ad23aa74':
lock out clicks while switching.

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 20:36:56 +0000 (13:36 -0700)]

am ee12f5aa: am 47cde77b: Fix camera bugs found overnight.

* commit 'ee12f5aa5701a0ace1bb61ea599cb024494b22cc':
Fix camera bugs found overnight.

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 20:36:50 +0000 (13:36 -0700)]

am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider

* commit '300772e6f8c8d313457ea7eb0e7be4b670403f77':
Integrate assets from UX; drag/bouncer animation behavior in slider

commit | commitdiff | tree

Jim Miller [Mon, 29 Oct 2012 20:36:44 +0000 (13:36 -0700)]

am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show.

* commit '3dd3a41aabfae3d5d27809b067da99568a516e22':
Fix issue where security view sometimes doesn't show.

commit | commitdiff | tree

Jim Miller [Mon, 29 Oct 2012 20:36:40 +0000 (13:36 -0700)]

am c8896dab: am a71984f3: Cleanup keyguard signals

* commit 'c8896dab510a3a758f651d92bfff8df0a4512670':
Cleanup keyguard signals

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 20:36:36 +0000 (13:36 -0700)]

am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard

* commit 'b1c5ec176d899b560f51e496b7719241d6ff8693':
Persist reordering/deleting widgets on keyguard

commit | commitdiff | tree

Robert Ly [Mon, 29 Oct 2012 20:36:32 +0000 (13:36 -0700)]

am 1de0549f: am 6a8d6da9: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs

* commit '1de0549fd6361c399f2e6e4d0e2c8c83856b9909':

commit | commitdiff | tree

Jim Miller [Mon, 29 Oct 2012 20:36:28 +0000 (13:36 -0700)]

am 33e62a80: am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev

* commit '33e62a8061803ebf6cc2cfa697a3b8677ba8287f':
Route signals from SlidingChalleng to SecurityView

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 20:36:23 +0000 (13:36 -0700)]

am 33760695: am 7de482ba: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev

* commit '3376069578f44aa81d7d30ceee72743a5d9b2158':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 20:36:19 +0000 (13:36 -0700)]

am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops

* commit '0d980a3b298a233ed4bbb39955c47a95e51d53c8':
Keyguard bouncer notifications; focus moving and the bouncer; slops

commit | commitdiff | tree

Chet Haase [Mon, 29 Oct 2012 20:36:15 +0000 (13:36 -0700)]

am c2b46a02: am b3975088: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev

* commit 'c2b46a02ee5e852c90450ad3154845782598d059':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:36:11 +0000 (13:36 -0700)]

am 3e41588b: am d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev

* commit '3e41588b931e40c692c39835f1b2f011822714cb':
Fix Google Now on lockscreen.

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 20:36:07 +0000 (13:36 -0700)]

am 6278f804: am 654761a0: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev

* commit '6278f80463604c28db0e497ddd17e3182c06d51d':

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 20:36:03 +0000 (13:36 -0700)]

am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev

* commit 'eb4c0cb5098bfceae762594621f4b5125ca7bbe4':
Manual frameworks/base merge from lockhotness (camera).

commit | commitdiff | tree

Svetoslav Ganov [Mon, 29 Oct 2012 20:36:00 +0000 (13:36 -0700)]

am f78367e2: am e3b51ef0: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev

* commit 'f78367e2d2dd1d25a2c474308a953149a9a35c60':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:56 +0000 (13:35 -0700)]

am 25c0e692: am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev

* commit '25c0e69287c479253b7520304ee4508aa05acc62':
Haptics for PIN enter key

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:53 +0000 (13:35 -0700)]

am b6890d34: am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev

* commit 'b6890d341222b0d1d8a34b391fa1634d4cc353f7':
Haptics for PIN keys.

commit | commitdiff | tree

Bryan Mawhinney [Mon, 29 Oct 2012 20:35:49 +0000 (13:35 -0700)]

am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev

* commit '033afa8c818a877e28fbf809a573929bdc460b90':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:46 +0000 (13:35 -0700)]

am 165303f6: am d5692742: PIN pad cosmetics.

* commit '165303f6453e641b9ffe666d434c9ae581a8ab7e':
PIN pad cosmetics.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:42 +0000 (13:35 -0700)]

am 51b0919d: am 2c1ce056: Cleaning up password input.

* commit '51b0919d301c10717c910928c5a03048e224f01f':
Cleaning up password input.

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:38 +0000 (13:35 -0700)]

am 9e126b92: am 51d39f2d: Add ECA to PIN view

* commit '9e126b92513388331b8af969d2d6f80b0408f795':
Add ECA to PIN view

commit | commitdiff | tree

Jim Miller [Mon, 29 Oct 2012 20:35:33 +0000 (13:35 -0700)]

am cc5abfd4: am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev

* commit 'cc5abfd4d6e62dd9c34f5aa8c6c08dfdab8a21ed':
Fix new password view in keyguard

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 20:35:26 +0000 (13:35 -0700)]

am fc00e67c: am 8b3dd400: Fix build

* commit 'fc00e67cb0c2242920103162dfc4328fcfee74ed':
Fix build

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 20:35:20 +0000 (13:35 -0700)]

am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev

* commit 'e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
Adding ability to add multiple widgets to keyguard

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 20:35:16 +0000 (13:35 -0700)]

am 62778aaa: am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev

* commit '62778aaa0317f0bdfb6901e8e6493161717e9b2a':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:13 +0000 (13:35 -0700)]

am 4dc794a7: am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev

* commit '4dc794a779ab6d208e276b88a9a2f12ee5a4034e':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 20:35:07 +0000 (13:35 -0700)]

am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking

* commit '662bf7b23e74bb7b92c3ace8ddfdeea1a6791961':
Beginnings of bouncer support; add scrims and state tracking

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 20:35:02 +0000 (13:35 -0700)]

am 446e66ed: am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev

* commit '446e66edd8eb335d23697614102c80fe3fe94655':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 20:34:56 +0000 (13:34 -0700)]

am 0234e9db: am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev

* commit '0234e9db974a05e93f691e2e613117867e59a79d':