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

165936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Laurent
8f89feba39 SoundTrigger JNI: fix local reference leak. 
Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
 2014-10-29 15:52:43 -07: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
kmccormick
2022db08ab Doc update: deliv receipt, rate exceeded, bug fixes. 
Fix for:

b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 15:49:36 -07: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
Alan Viverette
4e7c562c43 Merge "Update drawable state after updating tint list" into lmp-mr1-dev 2014-10-29 22:20:18 +00:00
Svetoslav
d3786a5931 Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev 2014-10-29 22:17:57 +00:00
Alan Viverette
2d3443fc5a Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 2014-10-29 22:05:11 +00:00
Alan Viverette
66c0adcfd4 Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 2014-10-29 22:05:05 +00:00
Alan Viverette
8785a56c8f Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 2014-10-29 22:05:01 +00:00
Vladimir Marko
d9e8b73fd0 am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:03:18 +00:00
Vladimir Marko
548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 21:57:16 +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
Vladimir Marko
e5fe7f3f40 Merge "Fix android_media_AudioSystem_getMasterMute return type." 2014-10-29 21:52:02 +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
79c067c54a Add setters for window elevation and clipToOutline properties 
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.

BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
 2014-10-29 14:27:47 -07:00
Vladimir Marko
b4b5518c81 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
 2014-10-29 21:18:00 +00: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
Svetoslav
7c053c1e41 Print preview disappearing if printer is changed. 
This is a regression caused by my previous patch.

Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
 2014-10-29 13:50:42 -07: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
Calin Juravle
bd705e5ed1 am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '5d5e4b14f67903370a7805492eb92fbe3b487a14':
  Use native brige only if we have a private data directory.
 2014-10-29 20:41:55 +00:00