Jim Miller
024e429b49
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
...
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
2011-05-20 16:14:15 -07:00
Adam Powell
bdc26dc34a
Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
2011-05-20 15:59:19 -07:00
Adam Powell
3f4a764cf4
Change measurement of effective screen height for PopupWindow now that
...
DisplayMetrics reports it without system decorations.
Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
2011-05-20 15:56:25 -07:00
Dianne Hackborn
1b144e625f
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
2011-05-20 14:28:43 -07:00
Jim Miller
14e45f9b19
Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
2011-05-20 13:13:19 -07:00
Jim Miller
5e731140f3
Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
2011-05-20 13:12:57 -07:00
Adam Powell
73a31ec91c
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
2011-05-20 12:59:43 -07:00
Dianne Hackborn
ea2117bdc0
Add ParcelFileDescriptor.fromFd() and .adoptFd().
...
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
2011-05-20 12:48:22 -07:00
Gloria Wang
a6f1104b9d
Use pread() to get the decrypted data for container based DRM file.
...
For bug 4392094.
Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
2011-05-20 10:15:21 -07:00
satok
b4788fdbfd
Do not merge. Backport two fixes for InputMethethodFramework
...
Bug: 3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
2011-05-20 22:11:54 +09:00
Adam Powell
8abebcde3f
New opaque cab assets; search dialog tweaks.
...
* New opaque assets (now actually opaque!)
* SearchDialog determines theme to use from parent context
* SearchDialog now disallows action modes
Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
2011-05-19 18:48:44 -07:00
Dianne Hackborn
69cb87576b
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Jim Miller
49b7adfdfb
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
...
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
2011-05-19 17:11:08 -07:00
Jim Miller
74de8b923a
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
...
This fixes LockScreen on 7" tablets by moving the resources to xlarge.
In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.
Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb
2011-05-19 17:05:30 -07:00
Adam Powell
b9537db8d9
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
2011-05-19 15:48:38 -07:00
Adam Powell
dacbb746c9
DO NOT MERGE Action bar config changes
...
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
2011-05-19 15:38:27 -07:00
Irfan Sheriff
9c9088a54f
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
2011-05-19 14:54:25 -07:00
Chet Haase
51fb97031f
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1
DO NOT MERGE: Add custom fragment anims for popping backstack
...
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.
The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.
Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
2011-05-19 13:44:40 -07:00
Joe Fernandez
146a0b4522
am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:53:04 -07:00
Joe Fernandez
fde9ac7266
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
2011-05-19 10:49:45 -07:00
Mike Lockwood
a88b42d569
USB: Add method to access raw USB device descriptors
...
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Adam Powell
b7ec3e41a6
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
2011-05-18 19:13:22 -07:00
Adam Powell
67a0a6ab09
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
...
Change-Id: I56a75189ae48f04934882661ce5014549a089769
2011-05-18 19:10:46 -07:00
Xavier Ducrohet
b18e700cb9
am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
...
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
2011-05-18 17:40:08 -07:00
Xavier Ducrohet
aa0834e3e6
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
2011-05-18 17:36:16 -07:00
James Dong
d148a499c2
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Irfan Sheriff
ffcea7ae73
Move softap config handling to WifiConfigStore
...
Move softap config to flat file and read/write on a seperate handler thread
Bug: 4391796
Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
2011-05-18 15:29:31 -07:00
Dianne Hackborn
6ad07db7a2
Merge "Fix fake display size when rotated." into honeycomb-mr2
2011-05-18 15:09:58 -07:00
Dianne Hackborn
8f7c271ac9
Fix fake display size when rotated.
...
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
2011-05-18 15:07:48 -07:00
Gloria Wang
07e9267d33
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Adam Powell
30a76196c8
Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
2011-05-17 20:24:39 -07:00
Adam Powell
5d6c990b7f
Fix bug 4416126 - orientation change bug with action bar overflow menu
...
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Dianne Hackborn
a429d5df1a
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
185d9c4dbf
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Dianne Hackborn
ffb3d939cc
Improve compat mode scaling implementation.
...
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range. Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially. Instead, we just apply the inverse scale at the few
points we need to do something the app sees.
Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
2011-05-17 18:29:51 -07:00
Adam Powell
bd964f9624
Tweak padding and sizing of alert dialog elements to fit better in
...
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.
Change-Id: Icd1261063511355844579d6c5c34f32284031f82
2011-05-17 18:25:56 -07:00
Katie McCormick
4ef5f4dce6
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00
Katie McCormick
566489dbf6
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
2011-05-17 17:21:00 -07:00
Mike Lockwood
27ac64ecee
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -07:00
Joe Fernandez
f6d8de6ff7
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
...
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
2011-05-17 15:13:46 -07:00
John Reck
1147bf638a
Don't use mobile for large uastring
...
Bug: 4427114
Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
2011-05-17 14:39:45 -07:00
Mike Lockwood
fbfe555125
StorageVolume: Add getStorageId() accessor
...
This ID is used for MTP as well as per volume querying in the media provider.
Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 17:19:37 -04:00
Eric Fischer
da48094557
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Mike Lockwood
50b2763159
Remove some cruft that was left in config.xml by mistake
...
This should fix build breakage for products with nosdcard set.
Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 16:08:22 -04:00
Eric Fischer
876533d98a
Import revised translations. DO NOT MERGE
...
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
2011-05-17 12:19:30 -07:00
Adam Powell
f721b398ad
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Adam Powell
1b4a1628f3
Prevent cases of bogus action bar measurement.
...
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00
Scott Main
a0ecd648ab
am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Scott Main
dcf2f35496
docs: simple update to OpenGl doc to update version support
...
Note, this doc still needs a lot more work; this is a small step
bug: 4395265
Change-Id: Ibe3fd816e88aa2b20ca99859b929164715f67027
2011-05-17 10:40:40 -07:00