drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,987 Commits 1 Branch 0 Tags
Commit Graph

165987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
15962f1da5 am 196edbc9: am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 
* commit '196edbc9f650d1840116e625092b8e9f5727806f':
  Make status bar expanding more tightly coupled to finger
 2014-10-31 00:16:29 +00:00
Jorim Jaggi
0b2c319f4c am 37651a8b: am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 
* commit '37651a8baa1405a8b53b41f8c75d75fa3d760956':
  Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
 2014-10-31 00:16:20 +00:00
Lorenzo Colitti
58d86a5c2a am 1a9864db: am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev 
* commit '1a9864db0af701074d9060f8eef8189e108485be':
  Enable 464xlat on wifi.
 2014-10-31 00:16:14 +00:00
Lorenzo Colitti
fa186dbd3d am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:16:09 +00:00
Nicolas Prevot
da0611a759 am ad93adfb: am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev 
* commit 'ad93adfb3d4b5470098ec82ea320b9e3669abddb':
  Schedule to write package restrictions.
 2014-10-31 00:15:55 +00:00
Chris Banes
3726cd1285 am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:15:48 +00:00
Dongwon Kang
c86090ea0c am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d 
* commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-31 00:15:40 +00:00
Dongwon Kang
27219325d5 am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-31 00:15:33 +00:00
Yigit Boyar
9d0a2dc15d am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
  Move all actionbar related methods to DecorToolbar
 2014-10-31 00:15:16 +00:00
Alan Viverette
af896cc719 am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'ce0bc26443bb61832ac59a0d367b9ec1a540301b':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-31 00:15:09 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Alan Viverette
370403dbde am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 
* commit '07a08010a87daec2091b643a8fcf2f7a27588098':
  Add theme and config change support to more Drawable types
 2014-10-31 00:14:51 +00:00
Alan Viverette
349e93ea65 am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
  Show scroll indicators in AlertDialog
 2014-10-31 00:14:38 +00:00
kmccormick
8909977bd1 am 30c27afc: am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '30c27afcc79ac574ab4dd8a8341ebd9e26b5ada3':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-31 00:14:29 +00:00
kmccormick
fa0af98f1b am d61ce7db: am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit 'd61ce7db43015fde515d85fe6c7a424030f8c8d3':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-31 00:14:23 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
Wale Ogunwale
75b1e8c5c6 am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit '0319e704c19deeea7cd8c93a6275ac02e565b473':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-31 00:13:36 +00:00
Eric Laurent
c27169e0d2 am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 
* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
  SoundTrigger JNI: fix local reference leak.
 2014-10-31 00:13:30 +00:00
Alan Viverette
c2663dfdab am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
  Update drawable state after updating tint list
 2014-10-30 23:44:49 +00:00
Svetoslav
65895facf2 am 39f35336: am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev 
* commit '39f35336e528434e59f4ea317498919d8d4f9dbd':
  Print preview disappearing if printer is changed.
 2014-10-30 23:44:43 +00:00
Alan Viverette
b50a6f39ca am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'baed009eaeaacffef7cc0972517434451e357aef':
  Add setters for window elevation and clipToOutline properties
 2014-10-30 23:44:37 +00:00
Alan Viverette
aff329f867 am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit '9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309':
  Ensure accessibility focus rect is drawn correctly
 2014-10-30 23:44:31 +00:00
Alan Viverette
136974c066 am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '19b1c26622bd17165f2bb187fcddf036fd3f53cd':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-30 23:44:25 +00:00
Dianne Hackborn
92faa96a26 am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '8f53ad8e7335068b4dd96db10916c3889960de5a':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-30 23:44:20 +00:00
Tom Taylor
d034f1a3d4 am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 
* commit 'b281c06834f8d5b60a8757f3fe603f003e06aa77':
  Add a missing mms_config constant to SmsManager
 2014-10-30 23:44:15 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Tyler Gunn
2a36953394 am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '7577f3dd8b738d73253f0c6bfe2383ef71a9ba20':
  Communicating participant changes to conference controller.
 2014-10-30 23:44:03 +00:00
Alan Viverette
bfc8599f43 am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
  Use action mode context for ActionMode menu inflater
 2014-10-30 23:43:58 +00:00
Vladimir Marko
54076d72f7 am 0904509f: am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 
* commit '0904509ff809fa2db59603a2d8f2a5a7ca64fa4f':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-30 23:43:52 +00:00
Chris Wren
04a14e599e am 7837294b: am 755f4021: fix build break from mis-named DEBUG flag in SystemUI 
* commit '7837294b84550ac9c7b6ecd51b9a8ccb153cc413':
  fix build break from mis-named DEBUG flag in SystemUI
 2014-10-30 23:43:47 +00:00
Chris Wren
e459a46c47 am 98204c18: am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev 
* commit '98204c18208888610f9804d9a33cd636de489a81':
  Add logging to diagnose notification click issue.
 2014-10-30 23:43:41 +00:00
Andre Eisenbach
8018fae1c1 am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit 'dfc472542f22469aca4982d4b87ed3e1d699f473':
  Fix crash during Bluetooth on/off stress test
 2014-10-30 23:43:37 +00:00
David Friedman
5decda261a am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-30 23:43:31 +00:00
Deepanshu Gupta
9f4979bf11 am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit 'c2a72054b158b318fdef54989e39e9220023d4a8':
  Add missing delegate for AnimatorInflater.
 2014-10-30 23:43:26 +00:00
Geoff Mendal
dd42fb6dda am f658b88f: (-s ours) am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f658b88fd1ee3bd92a8c7f32560217fd9805f7d6':
  Import translations. DO NOT MERGE
 2014-10-30 23:43:21 +00:00
Geoff Mendal
721090aeac am 550fa6b6: (-s ours) am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE 
* commit '550fa6b6751387a83b09392d9e042e8ccd2751d0':
  Import translations. DO NOT MERGE
 2014-10-30 23:43:16 +00:00
Wink Saville
4745d36c3e am e8ae9961: (-s ours) am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'e8ae9961b47452e7217f131df294a19304f0cb45':
  Import translations. DO NOT MERGE
 2014-10-30 23:43:11 +00:00
Deepanshu Gupta
a9f20a25d2 am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit '2df4ea4601075b3b0ef3e87d67f7107cbaeb5de2':
  Skip loading animations.
 2014-10-30 23:43:05 +00:00
Deepanshu Gupta
b9bbcccb5a am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit 'f82046b23367e844b43318d9cb73200750a042a5':
  Fix multiple styles case in resource resolution.
 2014-10-30 23:42:59 +00:00
Deepanshu Gupta
73b1b5a69f am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit 'c5afeb2cbbbf762013306397507fa2059d3aaf13':
  Use right theme for drawable inflation.
 2014-10-30 23:42:52 +00:00
Alan Viverette
7d96556604 am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '73ab31f610e15e5bb275132845f0146caa4039c6':
  Add content description to Toolbar collapse button
 2014-10-30 23:42:46 +00:00
Andre Eisenbach
1bf7bca511 am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-30 23:42:40 +00:00
Geoff Mendal
3488549f75 am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b2c607dbb876d2d32565e3183f472ea278a609ec':
  Import translations. DO NOT MERGE
 2014-10-30 23:42:35 +00:00
Calin Juravle
37e232dc9c am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit '21c3666effbcc79737af2f80f930fa9deee1622e':
  Use native brige only if we have a private data directory.
 2014-10-30 23:42:30 +00:00
Calin Juravle
aab0c1af12 resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. 
Change-Id: I50095f77a43c7e116bcedb1ad7cb7b45640cf1c7
 2014-10-30 23:27:54 +00:00
John Spurlock
5612c757df am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev 
automerge: a410961

* commit 'a410961f79d845713ab2722788a40afca51f0eef':
  PowerUI: Suppress warning on incremental drops.
 2014-10-30 19:20:25 +00:00
Jason Monk
5d06da8386 am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev 
automerge: 736695d

* commit '736695dc3ef2abb5fdb66c0e026e84fdc68a245f':
  QS: Only hide grid if there is detail to show
 2014-10-30 19:19:26 +00:00
Kenny Guy
a349784180 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
automerge: 5cf65f7

* commit '5cf65f7bf6ca0751749bff3f8c89ff9f0a3dc9cb':
  Listen for package changes for all users not just owner.
 2014-10-30 19:18:27 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
John Reck
97054254d4 am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
 2014-10-30 19:16:14 +00:00