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

157606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8f53ad8e73 am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '7ef463168c9ba08548858df086934b125c1ff57c':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-29 22:55:42 +00:00
Tom Taylor
b281c06834 am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 
* commit 'de48e8809ec5bd208ca032824c0fe607ed57af1d':
  Add a missing mms_config constant to SmsManager
 2014-10-29 22:55:37 +00:00
Jeff Hao
73577862ff am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit 'b1346d7829b83bcd813bc73506525822f4148429':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-29 22:55:29 +00:00
Tyler Gunn
7577f3dd8b am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '167230987b3224c30f2ecefa90a83fc19d449cf9':
  Communicating participant changes to conference controller.
 2014-10-29 22:55:20 +00:00
Alan Viverette
b2449a399b am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'd86d7bce78a5f6e70bdac8f6d4bb1a968d440128':
  Use action mode context for ActionMode menu inflater
 2014-10-29 22:55:09 +00:00
Vladimir Marko
0904509ff8 am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 
* commit '85d6f299943017f939ecfee9708f10b4e5fddd3e':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:55:04 +00:00
Chris Wren
7837294b84 am 755f4021: fix build break from mis-named DEBUG flag in SystemUI 
* commit '755f4021ae9a21936a04083098ffbbdac912625c':
  fix build break from mis-named DEBUG flag in SystemUI
 2014-10-29 22:54:56 +00:00
Chris Wren
98204c1820 am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev 
* commit 'b7efa04d529b87672b1167341852eca8ee9813c7':
  Add logging to diagnose notification click issue.
 2014-10-29 22:54:16 +00:00
Andre Eisenbach
dfc472542f am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit 'e2502eb9ad5eafc54ae06f06a72493748616dbd5':
  Fix crash during Bluetooth on/off stress test
 2014-10-29 22:54:10 +00:00
David Friedman
3be4e43b4c am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '543a82edd5a0a921570335e71004f33a3a68438f':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 22:54:03 +00:00
Deepanshu Gupta
c2a72054b1 am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '5456230d3b071cf699a4523f3f33bfcb5be4f54c':
  Add missing delegate for AnimatorInflater.
 2014-10-29 22:53:58 +00:00
Geoff Mendal
f658b88fd1 am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9bff44bdc4d91a1502bf2d30c0cbbe76751657f1':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:54 +00:00
Geoff Mendal
550fa6b675 am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE 
* commit '2c5e5ef50cfe0452935d319936335e655dee894d':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:48 +00:00
Wink Saville
e8ae9961b4 am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '0d1356c4f1a6627e10b2c587a5e3f415e2da1064':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:44 +00:00
Deepanshu Gupta
2df4ea4601 am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'bf59e8974d0c18dd3fd14631ad03de66d271a186':
  Skip loading animations.
 2014-10-29 22:53:39 +00:00
Deepanshu Gupta
f82046b233 am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit '122ccfb08fdde43793159d17d263271a0d311a1f':
  Fix multiple styles case in resource resolution.
 2014-10-29 22:53:34 +00:00
Deepanshu Gupta
c5afeb2cbb am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '62cf56cf99204bc3912119e8bed06e43f7ba6da9':
  Use right theme for drawable inflation.
 2014-10-29 22:53:29 +00:00
Alan Viverette
73ab31f610 am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '7a0ae7ed31a9e7e296c549dfbf035bf4270be69c':
  Add content description to Toolbar collapse button
 2014-10-29 22:51:47 +00:00
Andre Eisenbach
34964701e0 am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit 'db41880dd3259646b9ea43be6d8a91d4adb40122':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-29 22:51:38 +00:00
Geoff Mendal
b2c607dbb8 am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ba9836d9726bbc7413a07ae2b86afde8adcd4cc3':
  Import translations. DO NOT MERGE
 2014-10-29 22:50:44 +00:00
Calin Juravle
21c3666eff am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit 'ef0a7e8fdbf60d6e5cc5f274f94516c3077895e5':
  Use native brige only if we have a private data directory.
 2014-10-29 22:50:39 +00:00
Calin Juravle
acbd0025f8 am 5b0f193d: Merge "PreInitializeNativeBridge only if its Available" into lmp-mr1-dev 
* commit '5b0f193d25218557a23bdd7b4ee44d6932b71115':
  PreInitializeNativeBridge only if its Available
 2014-10-29 22:50:34 +00:00
John Spurlock
a410961f79 am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev 
* commit 'f9824b91f3706bb29272564bbf9c51497b51f4a7':
  PowerUI: Suppress warning on incremental drops.
 2014-10-29 22:50:27 +00:00
Jason Monk
736695dc3e am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev 
* commit '5d80f19c145f99eb1a2ada57a6fb1d8c3a6fa8b2':
  QS: Only hide grid if there is detail to show
 2014-10-29 22:50:22 +00:00
Kenny Guy
5cf65f7bf6 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
* commit '8cfb3f1e4dc76c4fa92e889991f0e9dd37823d1b':
  Listen for package changes for all users not just owner.
 2014-10-29 22:50:16 +00:00
Chris Wren
b3239da9a0 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
* commit '402152d6736839d89a9179cd4371201020074797':
  Reveal notification listener settings APIs.
 2014-10-29 22:50:08 +00:00
John Reck
a27e1a366a am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
  Be more conservative about current buffer
 2014-10-29 22:50:03 +00:00
Jorim Jaggi
358aed4587 am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev 
* commit '81aef807d5f1e3e3b5eda1162829e666c295f352':
  Improve doze transitions
 2014-10-29 22:49:51 +00:00
Geoff Mendal
ef3d9bc8ac am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a8a2844a1d2eeb77898e9f50ac2580896487113d':
  Import translations. DO NOT MERGE
 2014-10-29 22:49:46 +00:00
Jorim Jaggi
699560479d am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev 
* commit '6533c544cfc3896793e038ae303ce5b9eafebdab':
  Tune spacing in navigation bar for small and big devices
 2014-10-29 22:49:40 +00:00
Jorim Jaggi
987c68090c am b9e290c7: Cancel ripple animations when window is hidden 
* commit 'b9e290c7136fb7c76b7238426ccd598dec2d2643':
  Cancel ripple animations when window is hidden
 2014-10-29 22:49:33 +00:00
Calin Juravle
9917ebed86 am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev 
* commit 'd3a8c8aa530e6c1a605f469df7b378f688e7905a':
  Fix the length of a profiler system property
 2014-10-29 22:49:28 +00:00
Erik Kline
9a8351d9d7 am befe778c: Treat optimistic addresses as global preferred. 
* commit 'befe778c73e48417942fc31c06509bac8e5ca0d2':
  Treat optimistic addresses as global preferred.
 2014-10-29 22:49:23 +00:00
Jinsuk Kim
44ce605024 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
* commit '8be95fdde6a359e40e0b8bc6fb7bc9ea6e6091b0':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-29 22:49:16 +00:00
Anthony Lee
fe5e5dc13a am 6727926a: Added a function to clear accounts for a specified package. 
* commit '6727926a9617cb715ee4fa407f547e67a6f7e134':
  Added a function to clear accounts for a specified package.
 2014-10-29 22:49:10 +00:00
Lorenzo Colitti
ba69b3f290 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
* commit 'def4cd4fa4aa035a5000e6b196130496430d65ff':
  Support more than one clatd at a time.
 2014-10-29 22:49:05 +00:00
Alan Viverette
b00c424257 am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
* commit '05b2fedcb8057f31ed078a59a8cffce131449df0':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-29 22:48:52 +00:00
Shishir Agrawal
47fa171522 am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
* commit 'c8787beca679ca593dda05bb151ebe4afdf441c8':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-29 22:48:43 +00:00
Ihab Awad
0ca329e5d4 am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
* commit '6c37f374b5d86c798f799ac498b806d948c77f97':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-29 22:48:34 +00:00
Dianne Hackborn
7ef463168c Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 2014-10-29 21:55:50 +00:00
Tom Taylor
de48e8809e Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 2014-10-29 21:55:33 +00:00
Jeff Hao
b1346d7829 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 2014-10-29 21:47:30 +00:00
Jeff Hao
9f60c08a44 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
 2014-10-29 14:42:39 -07:00
Tyler Gunn
167230987b Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 2014-10-29 21:32:53 +00:00
Tom Taylor
4aa3684017 Add a missing mms_config constant to SmsManager 
Bug 18079788

Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
 2014-10-29 14:30:37 -07:00
Alan Viverette
d86d7bce78 Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 2014-10-29 21:14:56 +00:00
Vladimir Marko
85d6f29994 Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 2014-10-29 21:12:08 +00:00
Chris Wren
755f4021ae fix build break from mis-named DEBUG flag in SystemUI 
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
 2014-10-29 16:43:51 -04:00
Vladimir Marko
c1bcdbb758 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
 2014-10-29 20:34:15 +00:00
Chris Wren
b7efa04d52 Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev 2014-10-29 19:54:52 +00:00