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

69073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
7507d3d31c Fix measurement issues with Spinner and ListPopupWindow 
Bug 6132826 - make sure that our speculative measurement of list items
uses an accurate width MeasureSpec. This bug would sometimes affect
window sizing when measuring height if content could wrap in the
presence of restricted width.

Change-Id: Ie28573e952cac3dfa2b95e4691758c72f26b8fd9
 2012-03-08 12:19:31 -08:00
Adam Powell
1881f27b9d Merge "Fix bug 6029592 - font size setting causes clipped icon menu items" 2012-03-07 17:08:08 -08:00
Roman Nurik
1a30d4ab42 am 23b39217: am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '23b39217a5132bcf2cce94e98fbd486744f69958':
 2012-03-07 17:05:32 -08:00
Android Git Automerger
6063f7965d am 30e9f880: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '30e9f8807e6c7fd7f450b2d4ee91badb1afa4d77':
 2012-03-07 17:05:28 -08:00
Scott Main
b2924f66ff am 30f954dd: am bf03ee12: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '30f954dd2d0c44f3dcf542e42262cbd68353f34e':
 2012-03-07 17:05:25 -08:00
Roman Nurik
8398f19f5c am f4d8fa60: am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit 'f4d8fa6090f88ad84a543feba7fc74806af47ef4':
  docs: move Android Design from static HTML to JD
 2012-03-07 17:05:19 -08:00
Scott Main
75de60c018 am 842b4e22: am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '842b4e22e31f0fd976fa1b92620d680b7c37e78a':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-07 17:05:13 -08:00
Scott Main
d9ea892340 am 3f6912e5: am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings 
* commit '3f6912e5e8e821b75c401b6ca44e6080e9cc388b':
 2012-03-07 17:05:10 -08:00
Scott Main
a56d9b9d3f am 15b7481d: am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings 
* commit '15b7481d34a2c9a154cd68811860b1f4e1d41962':
  docs: a few more Market -> Play strings
 2012-03-07 17:05:07 -08:00
Xavier Ducrohet
c3b3e0dad1 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2012-03-07 17:05:06 -08:00
Dirk Dougherty
cd9bbc7a37 am 20d28a82: am 2ef5d3fd: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '20d28a82650cd6750649fd74da1031911c99ae9f':
 2012-03-07 17:04:52 -08:00
Selim Gurun
09ec58ea0f Merge "Prevent potential stall in dns proxy." 2012-03-07 17:04:52 -08:00
Dirk Dougherty
e6c6624614 am fad7db43: am 106cdc6a: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit 'fad7db430cac4a41eba2ce0b0710d551197c63e5':
  Update build-a-button to use new assets.
 2012-03-07 17:04:49 -08:00
Pin Ting
3b812863d8 am 5d37e4d7: am 21b45b62: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '5d37e4d7e7d9527be91de50661636cf30cbcc80d':
 2012-03-07 17:04:46 -08:00
Android Git Automerger
ef84fef0b3 am 3e22047d: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '3e22047d1c32f8ecf6299047f5a1323659d00110':
 2012-03-07 17:04:44 -08:00
Scott Main
2f5d053d43 am 73a7859b: am ed9651c9: am 1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push) 
* commit '73a7859b87f744cc197056e8939d96b2c76ef85b':
 2012-03-07 17:04:42 -08:00
Pin Ting
1d62c2f810 am 98dd4870: am 3b37fe24: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '98dd4870487d69be34059e70e3e86f05347d1afa':
  Fix document.
 2012-03-07 17:04:39 -08:00
Scott Main
fd18e5624e am 9d4ea2ba: am fb825c80: am 1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push) 
* commit '9d4ea2ba00904e85c2ecd31e4e75193dfa3c6787':
  docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
 2012-03-07 17:04:36 -08:00
Dirk Dougherty
87c3823223 am 391bb522: am 859717ad: am 4d7bc655: Doc change: String changes for Android Market 
* commit '391bb522013fab16b28dd8304530778114b448ce':
 2012-03-07 17:04:34 -08:00
Dirk Dougherty
97d0ae391d Merge "resolved conflicts for merge of 532679a5 to master" 2012-03-07 17:02:28 -08:00
Dirk Dougherty
e61cad321d resolved conflicts for merge of 532679a5 to master 
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
 2012-03-07 16:58:03 -08:00
Adam Powell
24e877e1c3 Fix bug 6029592 - font size setting causes clipped icon menu items 
Force the legacy icon menu panel to show text at a fixed size that will
not be badly clipped when the user has increased the system font size.

Change-Id: Ic991f2377424e4f42ab9f84b146650414cbde849
 2012-03-07 16:48:37 -08:00
Eric Laurent
7ef9743597 Merge "AudioService: fix system stream muted by restore" 2012-03-07 16:22:27 -08:00
Ben Gruver
2d5ddd1868 Merge "Fix up getAttributeFlags() function" 2012-03-07 16:16:18 -08:00
Glenn Kasten
78c914f37a Merge "IAudioFlingerClient::ioConfigChanged param2 const" 2012-03-07 16:08:59 -08:00
Eric Laurent
9ac8d0c445 AudioService: fix system stream muted by restore 
Releases prior ICS (included) would persist the stream volumes in the
database when muted by silent mode. If the DB was backed up while in
silent mode, stream volume was backed up at 0.
When restored on a new device, the volume was restored at 0 which was
a problem for SYSTEM stream because it would never be corrected as
this stream volume is fixed.

Added a check on valid volume values when reading settings from the DB
and correct the DB if this happens.

Change-Id: Ie3b98eb74e10413c22aab7568b83ac3ace5bfc07
 2012-03-07 16:00:57 -08:00
Jamie Gennis
ac3c33745f Merge "BufferQueue: fixed issues with buffer slots not available" 2012-03-07 15:48:11 -08:00
Scott Main
2a2e61341b am a38efc8d: am f246facb: am e606cb46: docs: fix api dashboard 
* commit 'a38efc8d74cfb22943c8a6dd816979e2ed19f221':
 2012-03-07 15:40:13 -08:00
Scott Main
08a991c7cb am 0bcf5e37: am 5ab7b3d1: am e606cb46: docs: fix api dashboard 
* commit '0bcf5e37d2fcb1ef54a494dca7f218ed2009ca7a':
  docs: fix api dashboard
 2012-03-07 15:40:05 -08:00
Scott Main
cbcc184de9 am 3f584a05: am b7ffa62c: am 290684ac: docs: fix expansion library package name 
* commit '3f584a052346ff5bf32f316aeb2855aa7b4599c7':
 2012-03-07 15:40:01 -08:00
Scott Main
c083ff092b am 5844b626: am 1054c676: am 290684ac: docs: fix expansion library package name 
* commit '5844b6265292e1e8b22d6f1179e28bacc11c057b':
  docs: fix expansion library package name
 2012-03-07 15:39:58 -08:00
Scott Main
ae682ae6ba am caa8d287: am a216ff33: am a47d88a7: docs: dashboard update for march 5 
* commit 'caa8d28790b9e90dd1a16a2557de0b6da099e45f':
 2012-03-07 15:39:45 -08:00
Andrew Flynn
e99022cecd am 6087dfcc: (-s ours) DO NOT MERGE Return 1.5 * density as default for large screens. 
* commit '6087dfcce1d095299a7d30d304903acf3e6fb541':
  DO NOT MERGE Return 1.5 * density as default for large screens.
 2012-03-07 15:39:43 -08:00
Ramanan Rajeswaran
62b7629cc0 am 4ec961d5: (-s ours) DO NOT MERGE 
* commit '4ec961d5752363161cc78112fbe542b1c0473158':
  DO NOT MERGE
 2012-03-07 15:39:40 -08:00
Dianne Hackborn
be9dcb0b00 am b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'b663a4b7da68cc6d81d4b338d94fb48eaec8cb05':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-03-07 15:39:38 -08:00
Ramanan Rajeswaran
2f25e61b87 am 5e7bb1e6: (-s ours) DO NOT MERGE 
* commit '5e7bb1e675df2cc1edd9808afcaaeed07830bd9f':
  DO NOT MERGE
 2012-03-07 15:34:11 -08:00
Dianne Hackborn
235cc3f5b7 am e6a0ec60: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'e6a0ec60607783b426b92f638055c79178fdd892':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-03-07 15:34:10 -08:00
JP Abgrall
d313c3adbd Merge "dumpstate: more tweaks in the data collection order." 2012-03-07 15:30:53 -08:00
Jim Miller
8247add51d Merge "Fix 6119433: disambiguate screen brightness changes from other lights" 2012-03-07 15:21:31 -08:00
Eric Fischer
94828c3f3b Merge "Import translations. DO NOT MERGE" 2012-03-07 15:02:24 -08:00
Eric Fischer
bb10f1dbfb Merge "Import translations. DO NOT MERGE" 2012-03-07 15:02:17 -08:00
Jim Miller
18651804ff Fix 6119433: disambiguate screen brightness changes from other lights 
This fixes a bug where the code asked to change the keyboard brightness
on a device that doesn't support it.  Instead of animating the keyboard
brightness, it ended up animating the display brightness and invoking
the power off animation as a result.  The fix is to ignore keyboard
brightness because we don't have any devices that currently support it.

Change-Id: I672d89f92f991812ea676f19c40058b2d3008656
 2012-03-07 14:59:06 -08:00
Eric Fischer
83ba2df45d Merge "Import translations. DO NOT MERGE" 2012-03-07 14:53:07 -08:00
John Reck
39aae0cefb Merge "Don't draw the focus ring if we don't have focus" 2012-03-07 14:42:20 -08:00
Mathias Agopian
fc004c1350 Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect" 2012-03-07 14:18:54 -08:00
Daniel Lam
c930cf3cf3 BufferQueue: fixed issues with buffer slots not available 
Bug: 6120953
Change-Id: Ief43f042ee9e1512e86fff8632a1c9dd31bdff35
 2012-03-07 14:15:34 -08:00
Chris Craik
28ae199eee Merge "reenable webkit paint pausing" 2012-03-07 14:12:41 -08:00
Eric Fischer
6ff1f4fa5d Import translations. DO NOT MERGE 
Change-Id: I7cfb3eeb7743f4db15ff591826d16cc316e2d915
 2012-03-07 14:03:43 -08:00
Eino-Ville Talvala
d5f0799082 Merge "NEW_API: Rework CameraSound into MediaActionSound, and unhide it." 2012-03-07 13:54:43 -08:00
Eric Fischer
1ff8796440 Import translations. DO NOT MERGE 
Change-Id: I1d2217605c628c8d31d2604fe9a1ee53b541fd15
 2012-03-07 13:17:06 -08:00