Baligh Uddin
|
39949bb0ac
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-10-28 17:30:51 -07:00 |
|
Baligh Uddin
|
8fb23898a5
|
Import translations. DO NOT MERGE
Change-Id: I252feb4a5dda101a56609fff1d17447375250153
Auto-generated-cl: translation import
|
2012-10-28 10:37:53 -07:00 |
|
Baligh Uddin
|
712556f5f2
|
Import translations. DO NOT MERGE
Change-Id: Ifec8cc64e9047964d26ac167583e81949d7f4826
Auto-generated-cl: translation import
|
2012-10-28 10:14:37 -07:00 |
|
Daniel Sandler
|
9eec7bb6e3
|
am 17d237e1: am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
* commit '17d237e1de4398a8045da2cdcb047c1fd862f8d4':
|
2012-10-26 15:24:42 -07:00 |
|
Daniel Sandler
|
302e5a9018
|
am a33079c7: am 3c84c9bc: Merge "Show brightness dialog for all users." into jb-mr1-dev
* commit 'a33079c7bc2a6a33341fe2560ae3c61442cf56de':
|
2012-10-26 15:24:38 -07:00 |
|
Daniel Sandler
|
eba1447a6e
|
am 363a119c: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
* commit '363a119c5292fbc1c25ce8ced09ee4da239fb40d':
|
2012-10-26 15:24:34 -07:00 |
|
Jim Miller
|
52c55cd0d0
|
am d6523da1: Merge latest prototype changes into the framework
* commit 'd6523da1ad7bae805a3dbea8d7b398d86cd3c181':
Merge latest prototype changes into the framework
|
2012-10-26 15:24:28 -07:00 |
|
Amith Yamasani
|
781f0c7ec2
|
am 596f143f: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
* commit '596f143fa659e2c9416a5b1a26e8b3064002c9cf':
|
2012-10-26 15:24:24 -07:00 |
|
Dirk Dougherty
|
2acc3b87ac
|
am 9bd62847: am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
* commit '9bd62847b835f2d30a476483148269cbef5681ad':
|
2012-10-26 15:24:19 -07:00 |
|
Jim Miller
|
13056c982a
|
am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
* commit '28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
Get basic keyguard working in new branch
|
2012-10-26 15:24:15 -07:00 |
|
Fabrice Di Meglio
|
91aae8b625
|
am 3f8794df: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
* commit '3f8794dfda9dd025a419ad19225bd4f227b297d3':
|
2012-10-26 15:24:12 -07:00 |
|
Kenny Root
|
890ca67c0a
|
am a063bc51: am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
* commit 'a063bc51cafc604436c1a2ad8b92de9908165f2e':
|
2012-10-26 15:24:08 -07:00 |
|
Eric Laurent
|
632387546c
|
am 49418d7c: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
* commit '49418d7c435954239cedd6a0f594b4cba1525b38':
|
2012-10-26 15:24:04 -07:00 |
|
Svetoslav Ganov
|
833550f9de
|
am 9fcdd729: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
* commit '9fcdd7293d428bf543526024d141373e9d5f06ee':
|
2012-10-26 15:24:00 -07:00 |
|
Christopher Tate
|
f834f72d05
|
am 3e96d3d1: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
* commit '3e96d3d1f9e04e155f79b2e8729f48cb21d1da3d':
|
2012-10-26 15:23:57 -07:00 |
|
Adam Cohen
|
ffa1a511b4
|
am c7eebe91: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
* commit 'c7eebe91ee107e40e9df8338c728d39e9db37ae8':
|
2012-10-26 15:23:53 -07:00 |
|
Irfan Sheriff
|
6d9c1c2676
|
am 503be131: am 61e42262: Fix group join CTS test
* commit '503be13166604e691dbe6fbb671522359012d4c0':
|
2012-10-26 15:23:49 -07:00 |
|
Fabrice Di Meglio
|
0567118987
|
am 68a9e6d2: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '68a9e6d2227f87689c5b7a113785dda06bcfd475':
|
2012-10-26 15:23:43 -07:00 |
|
Jeff Sharkey
|
ab33d668ff
|
am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit '17671ff0440159e3e529ff12c0f6b445e0d84302':
|
2012-10-26 15:23:39 -07:00 |
|
John Spurlock
|
629e0dcb39
|
am fd88c257: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit 'fd88c25725948f0302e0fcd642ce1bbd233acc46':
|
2012-10-26 15:23:35 -07:00 |
|
Romain Guy
|
fa04a22ee5
|
am ede74090: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit 'ede7409015a35c99b429d1b3d98bef5b56a154bd':
|
2012-10-26 15:23:31 -07:00 |
|
Craig Mautner
|
7613563c0c
|
am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit '561253f04ddf96071826706820f3b105fb914512':
|
2012-10-26 15:23:27 -07:00 |
|
Michael Jurka
|
d3352bc9eb
|
am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit '540300654b94c45adc95c4b02b13fbdbea5bb777':
|
2012-10-26 15:23:23 -07:00 |
|
Michael Jurka
|
54c7f0b21b
|
am 2275482b: am 80343f64: Fix recents animations for secondary users
* commit '2275482ba63324d390a3adf20d418fc33c1f0272':
|
2012-10-26 15:23:20 -07:00 |
|
Geremy Condra
|
76c9f3e0c6
|
am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit 'b81cedad5eb152f52cf7659dd8b710ac522a93f4':
|
2012-10-26 15:23:16 -07:00 |
|
Jeff Brown
|
bdf4c8ce5a
|
am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit 'c4070bbd225198dfd8ba1c71110d96d2c22c5a57':
|
2012-10-26 15:23:12 -07:00 |
|
Jeff Sharkey
|
e2243c89cd
|
am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit '9254d3108d1e2860a02448ea93e22dc066b99e3f':
|
2012-10-26 15:23:08 -07:00 |
|
Jeff Brown
|
bd25545961
|
am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit 'c6275f58ac7478850d2360ae4e1b9e98d8ae47d0':
|
2012-10-26 15:23:04 -07:00 |
|
Dave Burke
|
13d462564b
|
am 2a808f97: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
* commit '2a808f971f3d6d9791185d3eb986cb69b69da0e1':
|
2012-10-26 15:23:00 -07:00 |
|
Xavier Ducrohet
|
3a4fa2212f
|
am 8855ba62: am ed5387be: (-s ours) am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
* commit '8855ba623245a67be5becaf8f93e5abef35555e8':
|
2012-10-26 15:22:56 -07:00 |
|
Fabrice Di Meglio
|
cd94777f46
|
am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit 'afb856f2aa7590a191cb676acbee4141ddd21d6b':
|
2012-10-26 15:22:42 -07:00 |
|
Fabrice Di Meglio
|
57cfcfc8ab
|
am 7fb1aac6: am 0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '7fb1aac6b82c16a2417be2af019f211df85b1555':
|
2012-10-26 15:22:37 -07:00 |
|
Xavier Ducrohet
|
fcfc549e01
|
am ac7806b9: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
* commit 'ac7806b9a78ed66c9a8fa23b6637c836925ebfe7':
|
2012-10-26 15:22:33 -07:00 |
|
Fabrice Di Meglio
|
0b025ca792
|
am 78c66c99: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
* commit '78c66c993fb615fc8448cb0251ab21156074e33c':
|
2012-10-26 15:22:29 -07:00 |
|
Svetoslav Ganov
|
748ab7f2fb
|
am 34130c86: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
* commit '34130c86e53c684ed013255d22db64f0d297a994':
|
2012-10-26 15:22:26 -07:00 |
|
Craig Mautner
|
2d9f13cfb5
|
am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
* commit 'b05e449b083f1ccae52bc35c56afcd5fd7546629':
|
2012-10-26 15:22:22 -07:00 |
|
Irfan Sheriff
|
f1aabd93c2
|
am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
* commit 'd895caf7712f1dd87606cd95ffac9f94e6a757de':
|
2012-10-26 15:22:18 -07:00 |
|
Chet Haase
|
e7564bd64d
|
am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
* commit 'e114fcc763c584173592cbf723f1109b2cd6b783':
|
2012-10-26 15:22:14 -07:00 |
|
Jeff Hamilton
|
3be4c86c51
|
am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit 'd76ba62101ed3650a4e2edc640f8f311045eb82f':
|
2012-10-26 15:22:10 -07:00 |
|
Scott Main
|
d5bef5ddcb
|
am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
* commit '4e2e6dfdacf530c063303ae496ecc459c84acadd':
|
2012-10-26 15:22:06 -07:00 |
|
Xavier Ducrohet
|
aa3770fbae
|
am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
* commit 'e8c9ce73e3191949f4d05409a6c7aa7fc515c64d':
|
2012-10-26 15:22:02 -07:00 |
|
Christopher Tate
|
9de3919738
|
am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
* commit '3220289383a116b77d3c567462acff3d96c86426':
|
2012-10-26 15:21:58 -07:00 |
|
Scott Main
|
b2f81b8c98
|
am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
* commit 'c88e918482e40cff77af65bb9c56615bee32bb9a':
|
2012-10-26 15:21:54 -07:00 |
|
Chet Haase
|
89824595b6
|
am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
* commit '4bcf874003fca2d27da1b4cd027edc607ef59b2b':
|
2012-10-26 15:21:51 -07:00 |
|
Victoria Lease
|
ff33a01091
|
am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
* commit '645a16fbe15e31d0d4f80d5a8e1fa4ae386b4192':
|
2012-10-26 15:21:47 -07:00 |
|
Amith Yamasani
|
061bcd2703
|
am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
* commit '868f82ae97c7147e0d72e6558ffb76507a0feb13':
|
2012-10-26 15:21:43 -07:00 |
|
Daniel Sandler
|
40fae0bbc0
|
am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
* commit 'f400513d50fccdd38165ad13742ebabd9f1af3a3':
|
2012-10-26 15:21:39 -07:00 |
|
Michael Jurka
|
7fa48e695b
|
am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
* commit 'faa825909b1bd6a229b2ded406cb37c4a16c8b82':
|
2012-10-26 15:21:35 -07:00 |
|
Daniel Sandler
|
4db77891e5
|
am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
* commit '3f8460893fc9198824fa5e27fde9103a0160af6d':
|
2012-10-26 15:21:31 -07:00 |
|
Jeff Brown
|
335b606c34
|
am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '0ad3bb8b36d4a2532af74f80a6988bbcb5d1f663':
|
2012-10-26 15:21:27 -07:00 |
|