85366 Commits

Author SHA1 Message Date
Victoria Lease
b03a3d1c69 am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
* commit 'b77b3cfe41d0bca459040a68759a68f9ecc1f478':
  Get your own cursor Drawables, WebViewClassic!
2012-09-21 17:50:14 -07:00
Jason Sams
f68920464a am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev
* commit '7b3132d97a2a28093f139dc884cb4d43de65af50':
  Add Blend intrinsic.
2012-09-21 17:50:11 -07:00
Eino-Ville Talvala
09a792c7fd am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
* commit '5ce25d717059c9c37618aa349314077f99ac34c7':
  NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
2012-09-21 17:49:51 -07:00
Scott Main
fb0dad8211 am ec501466: am 2e642866: am be676b6c: am 4a5425db: fix layout bug
* commit 'ec501466ea78758de4e0ab8057713c697829c2ec':
  fix layout bug
2012-09-21 17:49:45 -07:00
Jeff Brown
919a4cdfe2 am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
  Support HDMI hotplug.
2012-09-21 17:49:35 -07:00
Baligh Uddin
3903284634 am 063d15ff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '063d15ff48c455203d4b7c2fb973ba081489c4ba':
  Import translations. DO NOT MERGE
2012-09-21 17:49:20 -07:00
Baligh Uddin
b83578d76f am 691b68b0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '691b68b0d5f89e695c77ddd20367556ff663ea2c':
  Import translations. DO NOT MERGE
2012-09-21 17:49:14 -07:00
Jim Miller
3b2cc5d011 am 7478cf86: Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev
* commit '7478cf86cec2cd994518492df01a6fdac062cd14':
  Tweak keyguard security flip animation timing.
2012-09-21 17:49:06 -07:00
Jim Miller
f084208bdf am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
* commit '1ed9fa10de3e94678ddb2929936caa3ff4164cf8':
  Make DPM API for disabling keyguard widgets more generic
2012-09-21 17:49:00 -07:00
Romain Guy
07f5825068 am 059aedf8: Merge "Finish this bit before I forget." into jb-mr1-dev
* commit '059aedf808c8b9b3da1457eef52f3d477878d50b':
  Finish this bit before I forget.
2012-09-21 17:48:45 -07:00
John Reck
2bb2b24ef1 am f98db0de: Merge "Improve find on page accessibility" into jb-mr1-dev
* commit 'f98db0de2248ad286b207eed6a826373cc60b786':
  Improve find on page accessibility
2012-09-21 17:48:24 -07:00
Eric Laurent
9e46af9cc2 am 2c0feeaf: Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev
* commit '2c0feeaffc89ef1f9b7b81074d0f5c9cbb97fc6b':
  Do not turn safe volume on upon headset connection
2012-09-21 17:48:20 -07:00
rich cannings
3b7f3cbfe8 am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
* commit '04c2bb86ca47378c99576c5ff7cb8283683dc935':
  Add setting to skip verifying ADB installs
2012-09-21 17:48:17 -07:00
Nick Kralevich
c11f1198a4 am 987f1e75: Merge "allowBackup doc fix." into jb-mr1-dev
* commit '987f1e759c8f6c2a69d7973b472031f3210ff5cb':
  allowBackup doc fix.
2012-09-21 17:48:04 -07:00
Derek Sollenberger
fad7b05e98 am 642030e3: Merge "Ensure that the decoder is thread-safe." into jb-mr1-dev
* commit '642030e3b3dca60b90d329f205ea2d805a96be0a':
  Ensure that the decoder is thread-safe.
2012-09-21 17:48:00 -07:00
Daniel Sandler
0ab7b9d0f8 am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
* commit 'df655d09c0dc4ce12ba4b191c1ebb888f123a3b1':
  Fix javadocs to fix build.
2012-09-21 17:47:46 -07:00
John Spurlock
7492091128 am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
* commit '2250550187ed7a2bd98d5f861151b49db5635f6e':
  Additions to Dream public api.
2012-09-21 17:47:36 -07:00
Winson Chung
3e3b3f17ba am 3ed6f945: Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
* commit '3ed6f9456a60cb3a2cf4166a7fa19e30b9bbd972':
  Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
2012-09-21 17:47:31 -07:00
Romain Guy
a132665291 am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev
* commit '4187f928921bab6a77e8b6592131f2a2b02ac0a3':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
2012-09-21 17:47:24 -07:00
Craig Mautner
ddb8d072cd am 9921d842: Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev
* commit '9921d842bb2654fd354612f5637c8a248bdb299f':
  Eliminate potential for NPE in WindowAnimator.
2012-09-21 17:47:14 -07:00
Chris Craik
96528d6511 am 61d37041: Merge "Polygonal rendering of simple fill shapes" into jb-mr1-dev
* commit '61d37041ac76a95aedb98d3550bb5efa33d898a1':
  Polygonal rendering of simple fill shapes
2012-09-21 17:47:07 -07:00
Dianne Hackborn
a0708b230d am 739bc9e3: Merge "Fix issue #7205845: Permissions screen: make "New" text blue instead of red" into jb-mr1-dev
* commit '739bc9e3f51c203fc0b58c30d67cacda985e95c6':
  Fix issue #7205845: Permissions screen: make "New" text blue instead of red
2012-09-21 17:47:03 -07:00
Romain Guy
18c166bcd6 am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev
* commit '3f7c246f3ea85af9fb98cba37387bb55658d4614':
  Update layers in a single batch at the beginning of a frame Bug #7186819
2012-09-21 17:46:55 -07:00
Bjorn Bringert
3661ee1e8b am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev
* commit '45b07b9427cc736bf4fd5658ef2f30884ba4d9a4':
  Add intents to open text and video from search.
2012-09-21 17:46:43 -07:00
Dan Morrill
26cee9f355 am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
  New method returning user metadata.
2012-09-21 17:46:29 -07:00
Victoria Lease
ebdb2c8c8a am 95c942eb: am 4feac670: (-s ours) am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
* commit '95c942eb227a6740611ac9d00eaafad9da515a11':
  Get your own cursor Drawables, WebViewClassic!
2012-09-21 17:45:51 -07:00
Baligh Uddin
af3934d7dd am 537d47f5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '537d47f510ce49acee09516ed5dde680d910ff94':
  Import translations. DO NOT MERGE
2012-09-21 17:45:44 -07:00
Daniel Sandler
5e4a5812ca am ced8d21f: Add string for \'Ethernet\'.
* commit 'ced8d21f5abf46d128264a3039f7a84155d2b9dc':
  Add string for 'Ethernet'.
2012-09-21 17:45:40 -07:00
Daniel Sandler
faded6e63b am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
* commit '0887711d0f76d858501fd017259ddfdc1950eb3f':
  Add Notification.Builder.setShowWhen(boolean).
2012-09-21 17:45:35 -07:00
Daniel Sandler
bdf11352d6 am 1227233b: Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev
* commit '1227233b6fcb9a6ef1aee8daa34bc3e18191f0db':
  Bugreport in Quick Settings (if you turn it on).
2012-09-21 17:45:24 -07:00
Daniel Sandler
7816f1a189 am a2facc33: Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev
* commit 'a2facc33cd8f8a717561ceb02efcbaf3c92a1bbe':
  Fix the seesaw behavior on the status panels.
2012-09-21 17:45:20 -07:00
Michael Jurka
1c46536721 am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
* commit '7566abd305a2b3060ae541055ed04f087f5266ec':
  Add support for changing status widget on security screen
2012-09-21 17:45:04 -07:00
Wu-cheng Li
baffb198a8 am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev
* commit 'c9cc62b96561933dd9257a78c6749195fbe8fdd3':
  Add secure version of image capture intent.
2012-09-21 17:44:59 -07:00
Raph Levien
73d2c347cb am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev
* commit '3034d45104f954eb15937e03ec74d86ca37894dc':
  Fix for native crash on image decode OOM
2012-09-21 17:44:54 -07:00
Amith Yamasani
38e69e96f4 am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev
* commit '74defbf202de713aa6ae19fbbf2ea5c318ccd11c':
  Query users excluding any being removed
2012-09-21 17:44:50 -07:00
Jim Miller
eea4be2743 am 3e87eafc: Merge "Fix the build." into jb-mr1-dev
* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75':
  Fix the build.
2012-09-21 17:44:42 -07:00
Victoria Lease
b77b3cfe41 Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev 2012-09-21 16:29:43 -07:00
Jason Sams
7b3132d97a Merge "Add Blend intrinsic." into jb-mr1-dev 2012-09-21 16:24:07 -07:00
Jason Sams
f70bb04346 Add Blend intrinsic.
Change-Id: I6f679c910fc23fe7441e17ad66bcf5f3dd7425a0
2012-09-21 16:10:49 -07:00
Eino-Ville Talvala
5ce25d7170 Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev 2012-09-21 16:05:59 -07:00
Scott Main
ec501466ea am 2e642866: am be676b6c: am 4a5425db: fix layout bug
* commit '2e6428668c97826e169e51ac5d0a7c6e8ba3bd79':
  fix layout bug
2012-09-21 16:03:39 -07:00
Scott Main
2e6428668c am be676b6c: am 4a5425db: fix layout bug
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
  fix layout bug
2012-09-21 16:00:51 -07:00
Scott Main
be676b6cc4 am 4a5425db: fix layout bug
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
  fix layout bug
2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2 fix layout bug
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
2012-09-21 15:55:15 -07:00
Jeff Brown
3ca5971339 Merge "Support HDMI hotplug." into jb-mr1-dev 2012-09-21 15:51:41 -07:00
Baligh Uddin
063d15ff48 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-21 15:43:54 -07:00
Baligh Uddin
ae4f783597 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 15:42:09 -07:00
Jeff Brown
e87bf03076 Support HDMI hotplug.
Bug: 7206678
Change-Id: Ia5212b16658a5f5a2ccf8528eca7bebd45ca857a
2012-09-21 15:34:32 -07:00
Baligh Uddin
691b68b0d5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-21 15:32:51 -07:00
Baligh Uddin
ad16da3f9b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 15:31:08 -07:00