OSDN Git Service
Daniel Sandler [Wed, 18 May 2011 21:42:29 +0000 (17:42 -0400)]
Turn off navbar for now.
Change-Id: I7b80312e172ccbf4b6ce30a35367fa14418368fb
Eric Fischer [Wed, 18 May 2011 00:14:56 +0000 (17:14 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 17 May 2011 23:51:41 +0000 (16:51 -0700)]
Import revised translations.
Change-Id: I8c101b5eaee4ed13f3b36f25ea90aa9c940c45d5
Brian Carlstrom [Tue, 17 May 2011 23:20:36 +0000 (16:20 -0700)]
Move to KeyChain.bind
Change-Id: Ic3c6e0e9be9bcfdc882cf97cec38cca70b23d0a1
Alex Sakhartchouk [Tue, 17 May 2011 22:40:29 +0000 (15:40 -0700)]
Merge "Moves fbo support in renderscript behind the hal"
Jamie Gennis [Tue, 17 May 2011 22:13:35 +0000 (15:13 -0700)]
Merge "SurfaceFlinger: unfreeze windows for fixed size buffers."
Jaikumar Ganesh [Tue, 17 May 2011 22:12:00 +0000 (15:12 -0700)]
Merge "Improve locking granularity for PAN and Input."
Jaikumar Ganesh [Fri, 8 Apr 2011 17:32:48 +0000 (10:32 -0700)]
Improve locking granularity for PAN and Input.
Long term, all this needs to be converted to a state machine.
Change-Id: I757a04994cd04e490a632b433e62b00a23880638
Romain Guy [Tue, 17 May 2011 22:06:09 +0000 (15:06 -0700)]
Merge "Improve LayoutInflater's compliance."
Jason Sams [Tue, 17 May 2011 22:05:50 +0000 (15:05 -0700)]
Merge "Core to client fifo on sockets."
Jason Sams [Tue, 17 May 2011 22:01:29 +0000 (15:01 -0700)]
Core to client fifo on sockets.
Change-Id: I3b84a7d4c3c5fa0d764ad4db22dfd142d5cfa95b
Brian Carlstrom [Tue, 17 May 2011 21:57:31 +0000 (14:57 -0700)]
Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)"
Romain Guy [Tue, 17 May 2011 21:25:49 +0000 (14:25 -0700)]
Improve LayoutInflater's compliance.
There are standards, we should do our best to implement them
properly.
Change-Id: I83a7dc0651795d09b19d536c17b6aefc2eca5c81
Fabrice Di Meglio [Tue, 17 May 2011 21:16:43 +0000 (14:16 -0700)]
Merge "View horizontalDirection public attribute resolution to an internal var."
Chet Haase [Tue, 17 May 2011 21:00:53 +0000 (14:00 -0700)]
Merge "Fix for using HARDWARE layers on unaccelerated views."
Adam Powell [Tue, 17 May 2011 20:57:07 +0000 (13:57 -0700)]
Merge "resolved conflicts for merge of
2b6ace58 to master"
James Dong [Tue, 17 May 2011 20:41:42 +0000 (13:41 -0700)]
Merge "Make track informational event optional, depending on system property"
Adam Powell [Tue, 17 May 2011 20:41:24 +0000 (13:41 -0700)]
resolved conflicts for merge of
2b6ace58 to master
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
Chet Haase [Tue, 17 May 2011 19:42:19 +0000 (12:42 -0700)]
Fix for using HARDWARE layers on unaccelerated views.
If a view is not accelerated but has its layer type set to
LAYER_TYPE_HARDWARE, then the framework will use the old drawing cache
approach, to cache it in a bitmap. This works fine, but when the layer
is set to NONE, that drawing cache is not destroyed, as it would be were
the layer set to LAYER_TYPE_SOFTWARE. This prevents future invalidations on
the view from working correctly because the bitmap cache has never been
destroyed and recreated.
The fix is to always destroy the drawing cache when the layer type is
changed from SOFTWARE or HARDWARE, to make sure that it gets set appropriately
regardless of the state of the view's acceleration.
Change-Id: I449649e6d370477825015505da76564455a156e6
Jeff Sharkey [Tue, 17 May 2011 19:27:01 +0000 (12:27 -0700)]
Merge "First pass at NetworkPolicy and activity tracking."
James Dong [Sat, 14 May 2011 14:22:40 +0000 (07:22 -0700)]
Make track informational event optional, depending on system property
o also add a track informational event to return the encoded data in kilo-bytes
Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
Adam Powell [Tue, 17 May 2011 19:21:22 +0000 (12:21 -0700)]
am
bd32a79e: am
f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit '
bd32a79ecb1109c71f80510c927f6dbc131ae563':
Prevent cases of bogus action bar measurement.
Adam Powell [Tue, 17 May 2011 19:18:05 +0000 (12:18 -0700)]
am
f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit '
f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
Adam Powell [Tue, 17 May 2011 19:16:29 +0000 (12:16 -0700)]
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 19:13:13 +0000 (12:13 -0700)]
Prevent cases of bogus action bar measurement.
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
Scott Main [Tue, 17 May 2011 18:55:13 +0000 (11:55 -0700)]
am
092aac23: am
8a769dd1: am
a0ecd648: 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 '
092aac23cef95ca4372a815210ff448b9c919aa4':
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
Scott Main [Tue, 17 May 2011 18:50:51 +0000 (11:50 -0700)]
am
8a769dd1: am
a0ecd648: 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 '
8a769dd1e3a328860c541faf56a6e676bf1dc01c':
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
Brian Carlstrom [Tue, 17 May 2011 07:40:28 +0000 (00:40 -0700)]
Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)
frameworks/base
Remove getCaCertificates and findIssuer from IKeyChainService,
these are now done via libcore's TrustedCertificateStore (as part
of the default TrustManager implementation)
keystore/java/android/security/IKeyChainService.aidl
Simplify KeyChain API. Now that the CA certificates are visible
through the default TrustManager, the KeyChain is solely focused on
retrieving PrivateKeys and their associated certificates. The
calling API for KeyChain to simply a single KeyChain.get() call
that returns a KeyChainResult, removing the need for a KeyChain
instance that needs to be closed.
keystore/java/android/security/KeyChain.java
keystore/java/android/security/KeyChainResult.java
master/libcore
Remove getDefaultIndexedPKIXParameters and
getIndexedPKIXParameters which was used as part of the prototype
of looking up CAs via the KeyChain but is obsoleted by the new
default TrustManager implementation.
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
packages/apps/KeyChain
Tracking simplified IKeyChainService, removing now unneeded
implementation, updating tests.
src/com/android/keychain/KeyChainService.java
tests/src/com/android/keychain/tests/KeyChainServiceTest.java
tests/src/com/android/keychain/tests/KeyChainTestActivity.java
Change-Id: I847b28c2f467c85f24d2b693a2fecc1cb46426b4
Scott Main [Tue, 17 May 2011 18:22:49 +0000 (11:22 -0700)]
am
a0ecd648: 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 '
a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
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
Scott Main [Tue, 17 May 2011 18:19:01 +0000 (11:19 -0700)]
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
Dianne Hackborn [Fri, 13 May 2011 19:39:48 +0000 (12:39 -0700)]
This API change is now part of MR2.
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
Scott Main [Tue, 17 May 2011 17:17:26 +0000 (10:17 -0700)]
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
Brian Carlstrom [Tue, 17 May 2011 17:37:44 +0000 (10:37 -0700)]
Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (1 of 6)"
Andreas Huber [Tue, 17 May 2011 17:37:25 +0000 (10:37 -0700)]
am
c9eb18bb: (-s ours) am
bf81d4be: am
c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit '
c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Andreas Huber [Tue, 17 May 2011 17:34:41 +0000 (10:34 -0700)]
am
bf81d4be: am
c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit '
bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Andreas Huber [Tue, 17 May 2011 17:31:58 +0000 (10:31 -0700)]
am
c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit '
c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Andreas Huber [Tue, 17 May 2011 17:29:36 +0000 (10:29 -0700)]
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
Andreas Huber [Tue, 17 May 2011 17:27:09 +0000 (10:27 -0700)]
Merge "Claim support for .3gpp2 A/B files."
Andreas Huber [Tue, 17 May 2011 17:12:34 +0000 (10:12 -0700)]
Claim support for .3gpp2 A/B files.
Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug:
4406745
Adam Powell [Tue, 17 May 2011 17:07:40 +0000 (10:07 -0700)]
am
143c529f: (-s ours) am
21f1d49f: am
a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '
143c529f28bd49e077e4bc36ff30ed2ff7ffb838':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
Adam Powell [Tue, 17 May 2011 17:07:23 +0000 (10:07 -0700)]
am
b45b21d1: am
b4eb3ace: am
79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit '
b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
Turn fading edges back on for ScrollView and HorizontalScrollView.
Adam Powell [Tue, 17 May 2011 16:55:53 +0000 (09:55 -0700)]
am
21f1d49f: am
a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '
21f1d49f0eac47c1ebbabf82f145dc60f988d069':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
Adam Powell [Tue, 17 May 2011 16:55:32 +0000 (09:55 -0700)]
am
b4eb3ace: am
79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit '
b4eb3acee4504ea35a43bef9dc6220560b55d2d2':
Turn fading edges back on for ScrollView and HorizontalScrollView.
Adam Powell [Tue, 17 May 2011 16:45:29 +0000 (09:45 -0700)]
am
a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '
a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
Adam Powell [Tue, 17 May 2011 16:45:26 +0000 (09:45 -0700)]
am
79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit '
79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
Adam Powell [Tue, 17 May 2011 16:41:52 +0000 (09:41 -0700)]
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 16:41:33 +0000 (09:41 -0700)]
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
Andreas Huber [Tue, 17 May 2011 15:35:37 +0000 (08:35 -0700)]
Merge "Disable yuv->yuv mode and external display support until various driver fixes are in."
Derek Sollenberger [Tue, 17 May 2011 11:55:56 +0000 (04:55 -0700)]
Merge "Updates resulting from the Skia merge (revision 1327)"
Narayan Kamath [Mon, 16 May 2011 15:51:44 +0000 (16:51 +0100)]
Pass synthesis request params through to the TTS service.
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
Dianne Hackborn [Tue, 17 May 2011 04:39:47 +0000 (21:39 -0700)]
am
b68c768d: am
41744836: am
7916ac65: Add new command line option to change global screen size.
* commit '
b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
Dianne Hackborn [Tue, 17 May 2011 04:29:32 +0000 (21:29 -0700)]
am
41744836: am
7916ac65: Add new command line option to change global screen size.
* commit '
417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
Dianne Hackborn [Tue, 17 May 2011 04:21:24 +0000 (21:21 -0700)]
am
7916ac65: Add new command line option to change global screen size.
* commit '
7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
Dianne Hackborn [Tue, 17 May 2011 03:45:48 +0000 (20:45 -0700)]
Add new command line option to change global screen size.
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
Jamie Gennis [Mon, 16 May 2011 23:55:03 +0000 (16:55 -0700)]
SurfaceFlinger: unfreeze windows for fixed size buffers.
This change makes SurfaceFlinger unfreeze a window if it ever gets a
buffer that is fixed-size. Normally the window would not be frozen if
its in fixed-size mode, but if the window was frozen before entering
fixed-size mode then it should be unfrozen.
Change-Id: I6bc822d4b02ae51fa8914c1f60f5d24b2002b38d
Christopher Tate [Mon, 16 May 2011 23:22:06 +0000 (16:22 -0700)]
bu - add handling for both 'backup' and 'restore' modes
Requires a parallel change in adb to support the new syntax.
Change-Id: Iff30cb247e424b6817af121c018f3c4e40b9f81a
Jim Miller [Mon, 16 May 2011 23:40:13 +0000 (16:40 -0700)]
Merge "Fix the build."
Jim Miller [Mon, 16 May 2011 23:38:06 +0000 (16:38 -0700)]
Fix the build.
Change-Id: I884580f52ebc817cee736f6d1bafbc59bd6662cd
Wink Saville [Mon, 16 May 2011 23:35:10 +0000 (16:35 -0700)]
am
360f5533: am
7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
* commit '
360f553311ab697995d24c2a42e45659a5436efa':
No data icon switch seen between LTE to EHRPD Handover
Wink Saville [Mon, 16 May 2011 23:31:56 +0000 (16:31 -0700)]
am
7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
* commit '
7b0339a8adca1347fe7ac3ac118c903ff32442a8':
No data icon switch seen between LTE to EHRPD Handover
Wink Saville [Mon, 16 May 2011 23:28:59 +0000 (16:28 -0700)]
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
Andreas Huber [Mon, 16 May 2011 23:14:13 +0000 (16:14 -0700)]
Disable yuv->yuv mode and external display support until various driver fixes are in.
Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
Roman Nurik [Mon, 16 May 2011 23:08:32 +0000 (16:08 -0700)]
am
3eb81b63: am
136fa20d: am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
3eb81b6318f94b21a3559df57f25ff2f48fcb244':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 23:06:27 +0000 (16:06 -0700)]
am
136fa20d: am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
136fa20d08d3a25c49077fde076febf105452edc':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Cibu Johny [Mon, 22 Feb 2010 21:01:02 +0000 (13:01 -0800)]
View horizontalDirection public attribute resolution to an internal var.
Change-Id: Id87ab188faef27ff039cf6a400118707ee74a27d
Roman Nurik [Mon, 16 May 2011 23:03:31 +0000 (16:03 -0700)]
am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 23:01:27 +0000 (16:01 -0700)]
am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 22:58:08 +0000 (15:58 -0700)]
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
Kazuhiro Ondo [Mon, 16 May 2011 22:28:27 +0000 (17:28 -0500)]
No data icon switch seen between LTE to EHRPD Handover
Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
Wink Saville [Mon, 16 May 2011 22:53:57 +0000 (15:53 -0700)]
am
648831cc: am
99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
* commit '
648831cc85f895e95ce65509f5e9e67ed4bf2926':
Fix data attempt while PS is not in-service
Wink Saville [Mon, 16 May 2011 22:51:02 +0000 (15:51 -0700)]
am
99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
* commit '
99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
Wink Saville [Mon, 16 May 2011 22:47:42 +0000 (15:47 -0700)]
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
Chia-chi Yeh [Mon, 16 May 2011 22:30:45 +0000 (15:30 -0700)]
Merge "Add a new permission for user space VPN applications."
Andreas Huber [Mon, 16 May 2011 22:21:26 +0000 (15:21 -0700)]
Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
Chia-chi Yeh [Fri, 13 May 2011 22:27:40 +0000 (15:27 -0700)]
Add a new permission for user space VPN applications.
Change-Id: I2b87ef34db01209dac45fbceccafd865840830d5
Fabrice Di Meglio [Mon, 16 May 2011 22:13:10 +0000 (15:13 -0700)]
Merge "Adding horizontalDirection public attribute for View."
Kazuhiro Ondo [Wed, 11 May 2011 04:10:37 +0000 (23:10 -0500)]
Fix data attempt while PS is not in-service
mAutoAttachOnCreation flag was incorrectly initialized which was
causing invalid data attempts while PS is not in-service.
Change-Id: Iaf16b70b1997631309a4918a99ac5f3c3ea74d02
Cibu Johny [Mon, 22 Feb 2010 21:01:02 +0000 (13:01 -0800)]
Adding horizontalDirection public attribute for View.
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
Justin Ho [Mon, 16 May 2011 21:45:38 +0000 (14:45 -0700)]
Merge "Cleaning up notification panel drawables"
Irfan Sheriff [Mon, 16 May 2011 21:12:08 +0000 (14:12 -0700)]
am
33285c69: am
19055424: am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
33285c69a6bb01d8e3420694e257802f95d1e884':
Fix ISO country code of Slovenia.
Scott Main [Mon, 16 May 2011 21:10:09 +0000 (14:10 -0700)]
am
5bb0c89c: am
0593d383: am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
5bb0c89cf86c415a94d72469684234d3f7e067ec':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:09:26 +0000 (14:09 -0700)]
am
19055424: am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
190554246b6fda3453f4a7994fb461f841e82a4a':
Fix ISO country code of Slovenia.
Scott Main [Mon, 16 May 2011 21:06:25 +0000 (14:06 -0700)]
am
0593d383: am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
0593d383f3c50853123fa99fea172b37463990e0':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:06:11 +0000 (14:06 -0700)]
am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
Adam Powell [Mon, 16 May 2011 21:04:31 +0000 (14:04 -0700)]
Turn fading edges back on for ScrollView and HorizontalScrollView.
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486
Scott Main [Mon, 16 May 2011 21:03:43 +0000 (14:03 -0700)]
am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:02:39 +0000 (14:02 -0700)]
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
Scott Main [Mon, 16 May 2011 21:01:30 +0000 (14:01 -0700)]
am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug:
4439292
Roman Nurik [Mon, 16 May 2011 21:00:13 +0000 (14:00 -0700)]
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
Robert Greenwalt [Fri, 8 Apr 2011 16:53:55 +0000 (09:53 -0700)]
Fix ISO country code of Slovenia.
Misread an IBM site and thought it was sl-sl, but really it is sl-si.
fixes public bug 16021
Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
Scott Main [Mon, 16 May 2011 20:54:02 +0000 (13:54 -0700)]
docs: add redirects to key legacy docs
bug:
4439292
Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
Adam Powell [Mon, 16 May 2011 20:41:24 +0000 (13:41 -0700)]
DO NOT MERGE Use action bar overflow menus on large configurations as
well as xlarge.
ICS will have a more intelligent way of determining this.
Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
Dianne Hackborn [Mon, 16 May 2011 20:18:54 +0000 (13:18 -0700)]
am
60e13114: (-s ours) am
1d340a3c: am
0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '
60e13114eb806d50b7b362d39051c5c775704bf6':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Dianne Hackborn [Mon, 16 May 2011 20:16:45 +0000 (13:16 -0700)]
am
1d340a3c: am
0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '
1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Dianne Hackborn [Mon, 16 May 2011 20:13:00 +0000 (13:13 -0700)]
am
0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '
0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Dianne Hackborn [Mon, 16 May 2011 20:11:27 +0000 (13:11 -0700)]
am
63446167: (-s ours) am
fddd927f: am
9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '
63446167b9d6d9ed3410320d17e8fe816caf6c42':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Dianne Hackborn [Mon, 16 May 2011 20:11:24 +0000 (13:11 -0700)]
am
f97ed771: (-s ours) am
d90a2c4d: am
1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '
f97ed771979162c4a2a75959c57fb793438a3a8b':
DO NOT MERGE. Integrate from master: Rework display size access.
Dianne Hackborn [Mon, 16 May 2011 20:10:23 +0000 (13:10 -0700)]
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
Mike Lockwood [Mon, 16 May 2011 20:08:12 +0000 (16:08 -0400)]
resolved conflicts for merge of
b107f4de to master
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
Dianne Hackborn [Fri, 22 Apr 2011 00:26:39 +0000 (17:26 -0700)]
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Not yet working, so turned off.
Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.
Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
OSDN Git Service
