88476 Commits

Author SHA1 Message Date
Daniel Sandler
7fa5c737cc am cf64067c: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
* commit 'cf64067c95a83d56381ff62c9222098f314b949a':
2012-10-29 09:16:52 -07:00
John Spurlock
19a2f53060 am 31821c5b: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
* commit '31821c5b6170d5f560c7f74b262278399c9ff3e9':
2012-10-29 09:16:49 -07:00
Jim Miller
bf83ea6aa3 am 5d3f8599: Merge multi-user stuff from prototype into framework.
* commit '5d3f8599590026d6fc275739613fe6ddb180af55':
  Merge multi-user stuff from prototype into framework.
2012-10-29 09:16:45 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
2012-10-29 09:16:37 -07:00
erin rosenthal
ea6bfffaa4 am 9415aa1c: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
* commit '9415aa1c1b51f82a73ddc669771d850304cc704c':
2012-10-29 09:16:33 -07:00
Eric Laurent
4e03542213 am d691056c: am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
* commit 'd691056ca86b07176b2bf2f9abc3cf996b61f6f1':
2012-10-29 09:16:30 -07:00
Jim Miller
ec141cd382 am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
* commit '086977094d96ab9352432e0941a05b09cefc92ac':
  Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
2012-10-29 09:16:26 -07:00
Amith Yamasani
54b84a3f74 am 8e6dcb00: am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
* commit '8e6dcb0045a5085cb41beb6f66977ba664847d4b':
2012-10-29 09:16:22 -07:00
Michael Jurka
e7c4e24bc5 am 5419ae87: am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
* commit '5419ae873db25f83967a6ca65b6e546e7da4afce':
2012-10-29 09:16:18 -07:00
Kenny Root
595bd1cbfb am 8af55c66: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit '8af55c660df4688c73cc0433efac22970434731a':
2012-10-29 09:16:14 -07:00
Raph Levien
8b69044e47 am 9ed957c2: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
* commit '9ed957c20f0e491f1fa4624fab6ca8649ac86f28':
2012-10-29 09:16:10 -07:00
Chet Haase
343806f107 am 8f87ea2d: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
* commit '8f87ea2da6fc57427e30e21be90047a820dc2adf':
2012-10-29 09:16:02 -07:00
Baligh Uddin
6586c17b51 am acba3808: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'acba3808357d5c4f9660ae7144bd2d0fe836469f':
  Import translations. DO NOT MERGE
2012-10-29 09:15:58 -07:00
Baligh Uddin
05834a4d99 am d046acd7: am 5be59670: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd046acd735de25142aaef3ccce616073460e2584':
2012-10-29 09:15:54 -07:00
Colin Cross
be017a0ed8 am 899b3d9a: am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
* commit '899b3d9acaab91ba230ba04ddd7560f44886faef':
2012-10-29 09:15:51 -07:00
Jamie Gennis
b4ff4d93dc am 167cd3e3: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
* commit '167cd3e36700e772392207ad69e42a868cc94808':
2012-10-29 09:15:47 -07:00
Svetoslav Ganov
9b30f7b677 am 047ceab5: am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
* commit '047ceab558632aff281c8def25f168f35f1a69f5':
2012-10-29 09:15:40 -07:00
Victoria Lease
47b8f46a4e am 2e2f8508: am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
* commit '2e2f8508eec6cb08326ce528d939554512db6acd':
2012-10-29 09:15:36 -07:00
Amith Yamasani
c71802a291 am aad8cd4d: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
* commit 'aad8cd4daa6cd1d354e0c1de03ce5a65a44a04db':
2012-10-29 09:15:32 -07:00
Adam Powell
54b17df580 am a6ea59ef: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
* commit 'a6ea59ef4929826757796660340b0be541f1a838':
2012-10-29 09:15:29 -07:00
Daniel Sandler
9bbb73bac6 am cedb7095: am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
* commit 'cedb7095a01552568a5dc63e3d89ea6c9be2a5ee':
2012-10-29 09:15:25 -07:00
Daniel Sandler
ac135110a3 am c613a062: am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
* commit 'c613a062f17e449743c253e9a6ffc5f3f231d20a':
2012-10-29 09:15:21 -07:00
Michael Jurka
90f7d72efd am 164497d6: am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
* commit '164497d6712fd6257821f6663a00b5db0e8472d4':
2012-10-29 09:15:17 -07:00
Baligh Uddin
3385788739 am 55fb1ab5: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '55fb1ab5ffa794d4e183f9281d2f8933b9f3845a':
  Import translations. DO NOT MERGE
2012-10-29 09:15:13 -07:00
Jeff Brown
8304cac585 am 1ab678ba: am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
* commit '1ab678ba71ac0b85f4c77542e59c59f7dd07d424':
2012-10-29 09:15:09 -07:00
Dianne Hackborn
9157e183b7 am a582c508: am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
* commit 'a582c5081b2775eb0ab59ff9c8332f3f8ccf5361':
2012-10-29 09:15:05 -07:00
Baligh Uddin
4dc9e59898 am ad0bda19: am e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'ad0bda19947e685f7e00bfbfad9128649e6f44dd':
2012-10-29 09:15:00 -07:00
Baligh Uddin
203f0fa1b6 am e570c9c6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'e570c9c6f47ebfebcfd21194f6362e954b45245d':
  Import translations. DO NOT MERGE
2012-10-29 09:15:00 -07:00
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