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

165818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jorim Jaggi
ba541fd0c2 am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev 
automerge: 358aed4

* commit '358aed4587c3c278bff61b90291d4e69ab6b5b04':
  Improve doze transitions
 2014-10-30 19:14:48 +00:00
Geoff Mendal
c609f4db3f am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: ef3d9bc  -s ours

* commit 'ef3d9bc8ac5208d8a8e30ae0a7e60a0dc461d2c4':
  Import translations. DO NOT MERGE
 2014-10-30 19:13:52 +00:00
Jorim Jaggi
fa61bfa429 am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev 
automerge: 6995604

* commit '699560479d76e3056e54bf3850ba301b6a0acf90':
  Tune spacing in navigation bar for small and big devices
 2014-10-30 19:12:58 +00:00
Jorim Jaggi
468e6b7e8b am b9e290c7: Cancel ripple animations when window is hidden 
automerge: 987c680

* commit '987c68090c8298f2d6a03ba01b703a5908ef16a2':
  Cancel ripple animations when window is hidden
 2014-10-30 19:11:56 +00:00
Calin Juravle
298c170ae7 am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev 
automerge: 9917ebe

* commit '9917ebed862ed8b687f5d17779c4e250fb5a30f6':
  Fix the length of a profiler system property
 2014-10-30 19:11:00 +00:00
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Jinsuk Kim
2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:09:06 +00:00
Anthony Lee
9802c4c206 am 6727926a: Added a function to clear accounts for a specified package. 
automerge: fe5e5dc

* commit 'fe5e5dc13a934581a05c740bfa104e078e94899d':
  Added a function to clear accounts for a specified package.
 2014-10-30 19:07:57 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:05:27 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
Ihab Awad
ac2b7f75cc am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
automerge: 0ca329e

* commit '0ca329e5d4ea9057337c30ca07ff5009ffc01a34':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-30 19:03:04 +00:00
Geoff Mendal
8a44f0f0be am 07c45951: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '07c45951be4ae801e3d7de016d9e98e12dbcda00':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:25 +00:00
Geoff Mendal
990c7ced90 am 6904eac7: (-s ours) Import translations. DO NOT MERGE 
* commit '6904eac728cd94007c6d7787c56960c8cffcd4f1':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:14 +00:00
Sanket Padawe
ef87affff7 am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
* commit '1ba2b168c0397e833272acbb4b7b8334e1789a6e':
  Remove checks to support new sim color selection.
 2014-10-30 11:03:41 +00:00
Alan Viverette
2a4c7618ef am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
* commit '09da6ec635fc4565aa7cdac62dccd40fcf73b359':
  Update drag-to-open menu close behavior
 2014-10-30 11:03:35 +00:00
Yorke Lee
1dd9d241c1 am 3e29a313: am e398db4a: Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 
* commit '3e29a3130aec59d388f438bf8de8885278e3ceb6':
  Add comment to TelecomManager.getCallState
 2014-10-30 10:18:56 +00:00
Adrian Roos
f3aadaf5dd am ca6e3879: am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit 'ca6e38792d9b001dc404cfa83808aec88369c822':
  Close keyguard user switcher on tap outside
 2014-10-30 10:18:33 +00:00
John Spurlock
e89c714dba am e8c3c3f7: am 2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 
* commit 'e8c3c3f7069fd636d29bbbbebbf2790643081599':
  Zen: Fix quantity format specifiers for quantity=1.
 2014-10-30 10:18:24 +00:00
Santos Cordon
a567b68bbe am 3126b3e4: am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '3126b3e4835df82e54bf57b6e30a20c6922b0b81':
  Update javadocs for Telecom APIs.
 2014-10-30 10:18:18 +00:00
Jeff Davidson
ab3e142b30 am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit '306eac5f41de151a1be6832f6629113eef0b10e4':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:18:12 +00:00
Joe Fernandez
b51bd437c2 am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '296e0a79b988a5eb601ab60419b810d031fdf20b':
  docs: Update timing of Android Wear app review
 2014-10-30 10:18:05 +00:00
David Friedman
2a2200c63c am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '387675d9050e699de4d976cfe78faec389673cb1':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:17:59 +00:00
Eric Gilmore
ba6abdf841 am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '7e99cedb50bc0712cc879852e16793cfeeb0d85a':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:17:52 +00:00
Sebastien Hertz
837b140c82 resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
 2014-10-30 11:06:41 +01:00
Elliott Hughes
1b9813ad0b am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'b6e004261cc5c1b9b9ab338ce30896f537182336':
  Fix not to show a log with empty default ime
 2014-10-30 03:19:32 +00:00
Elliott Hughes
b6e004261c am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
  Fix not to show a log with empty default ime
 2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
 2014-10-30 09:22:17 +09: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