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

166078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ricardo Cervera
9a6fdfe853 docs: Two-page notification fix. 
Bug: 18108228

Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
 2014-10-29 14:27:22 -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
Santos Cordon
d9e614fd56 More updates to javadocs for Telecom APIs. 
Change-Id: I8f8389f521c0d654c9bfdc3ad9670be0d118f480
 2014-10-29 14:13:00 -07: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
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
Alan Viverette
d513379239 Update drawable state after updating tint list 
BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
 2014-10-29 19:46:54 +00:00
Andre Eisenbach
e2502eb9ad Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 2014-10-29 19:35:19 +00:00
Narayan Kamath
3cad510e27 am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.
 2014-10-29 19:34:32 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Andre Eisenbach
178d3b54cd Fix crash during Bluetooth on/off stress test 
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
 2014-10-29 12:13:38 -07:00
David Friedman
543a82edd5 am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '51209aa38ee9895c639fbbb6f469f926f3c66b7f':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:52:29 +00:00
Deepanshu Gupta
5456230d3b am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
  Add missing delegate for AnimatorInflater.
 2014-10-29 18:52:21 +00:00
Geoff Mendal
9bff44bdc4 am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '39ae5dd786aff204888457a648ed291926e33334':
  Import translations. DO NOT MERGE
 2014-10-29 18:52:13 +00:00
Geoff Mendal
2c5e5ef50c am c88fbd3c: (-s ours) Import translations. DO NOT MERGE 
* commit 'c88fbd3cce87f67aad17c636b9e23b4e29afac6a':
  Import translations. DO NOT MERGE
 2014-10-29 18:52:00 +00:00
Wink Saville
0d1356c4f1 am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f7543b40d25db5cc089a4cadea6c1444a56d3b25':
  Import translations. DO NOT MERGE
 2014-10-29 18:51:49 +00:00
Deepanshu Gupta
bf59e8974d am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'de4ee0f1be350a52d642a447269a91f6d28e73fc':
  Skip loading animations.
 2014-10-29 18:51:32 +00:00
Deepanshu Gupta
122ccfb08f am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit '916d779650352059b08b7257f71a7aab8b333eba':
  Fix multiple styles case in resource resolution.
 2014-10-29 18:51:28 +00:00