OSDN Git Service
Tadashi G. Takaoka [Tue, 31 May 2011 07:23:25 +0000 (00:23 -0700)]
am
69a48776: am
8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '
69a487763812d2c0fb3c9900b12862997bc77f4d':
Fix input type judgment of WebTextView (DO NOT MERGE)
Tadashi G. Takaoka [Tue, 31 May 2011 07:18:54 +0000 (00:18 -0700)]
am
8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '
8ede62745faa02265f927941d1195b6c1bf05ebb':
Fix input type judgment of WebTextView (DO NOT MERGE)
Tadashi G. Takaoka [Sat, 28 May 2011 14:40:19 +0000 (23:40 +0900)]
Fix input type judgment of WebTextView (DO NOT MERGE)
Bug:
4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
Conley Owens [Sun, 29 May 2011 16:00:21 +0000 (09:00 -0700)]
am
10b364b4: am
4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '
10b364b4bea8537f955bbbb8b9b40061264b29c9':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
Xavier Ducrohet [Sun, 29 May 2011 16:00:16 +0000 (09:00 -0700)]
am
228e4716: (-s ours) am
34f5991e: Merge
6103e22c from honeycomb-mr1. do not merge.
* commit '
228e4716278f450a95be5addacc3c6c940668493':
Merge
6103e22c from honeycomb-mr1. do not merge.
Xavier Ducrohet [Sun, 29 May 2011 15:59:57 +0000 (08:59 -0700)]
am
af83d4ec: (-s ours) am
c7b87766: Merge
2402ad60 from honeycomb-mr1. do not merge.
* commit '
af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
Merge
2402ad60 from honeycomb-mr1. do not merge.
Ed Heyl [Sun, 29 May 2011 15:21:53 +0000 (08:21 -0700)]
Merge "resolved conflicts for merge of
a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp
satok [Sat, 28 May 2011 07:06:55 +0000 (00:06 -0700)]
am
93b05690: am
5485ff61: Reduce the number of notification icons on narrow screens.
* commit '
93b05690ff006fa3f96ed5e09031e18d529ae794':
Reduce the number of notification icons on narrow screens.
satok [Sat, 28 May 2011 07:02:54 +0000 (00:02 -0700)]
am
5485ff61: Reduce the number of notification icons on narrow screens.
* commit '
5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
Reduce the number of notification icons on narrow screens.
satok [Fri, 27 May 2011 10:15:01 +0000 (19:15 +0900)]
Reduce the number of notification icons on narrow screens.
For devices with minimum width between 600 and 720 dp, show
only 3 icons (and then, only in portrait). All other
configurations will show 5.
Bug:
4501374
Change-Id: I88168560fc2876c26cd3eb57f2db0b0cfe8b4fdd
Kazuhiro Ondo [Sat, 28 May 2011 02:32:04 +0000 (19:32 -0700)]
am
57675037: Further fix for SIM detection.
* commit '
57675037aa279e715a966e2888a31c97381a5fe4':
Further fix for SIM detection.
Kazuhiro Ondo [Fri, 27 May 2011 22:01:51 +0000 (17:01 -0500)]
Further fix for SIM detection.
Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.
Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
Dianne Hackborn [Sat, 28 May 2011 00:16:19 +0000 (17:16 -0700)]
am
8075fe48: am
78470718: Fix various places that were using the wrong display metrics.
* commit '
8075fe48bf345e4014de9b7bee8def5f4373457c':
Fix various places that were using the wrong display metrics.
Dianne Hackborn [Sat, 28 May 2011 00:12:53 +0000 (17:12 -0700)]
am
78470718: Fix various places that were using the wrong display metrics.
* commit '
784707187d96b731df5256c1c2adb0aaf9037239':
Fix various places that were using the wrong display metrics.
Dianne Hackborn [Sat, 28 May 2011 00:09:19 +0000 (17:09 -0700)]
Fix various places that were using the wrong display metrics.
Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
Dianne Hackborn [Sat, 28 May 2011 00:01:47 +0000 (17:01 -0700)]
am
e5d37701: am
8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '
e5d377014b04022a04fd0b2b24b343d1e0ec8d2a':
Fix compat mode bugs when updating apps.
Dianne Hackborn [Fri, 27 May 2011 23:58:33 +0000 (16:58 -0700)]
am
8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '
8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
Fix compat mode bugs when updating apps.
Dianne Hackborn [Fri, 27 May 2011 23:45:31 +0000 (16:45 -0700)]
Fix compat mode bugs when updating apps.
No longer accidentally puts an app into compatibility mode.
Also various cleanup, freezing screen while switching between modes.
Change-Id: Ic1b3958be7800189a93f68e9dee3c5adfc45fe57
Dianne Hackborn [Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)]
am
528c49f1: am
b96cbbd1: Add "tv" density for 720p screens.
* commit '
528c49f112dce5f9687f30a9751e783196eca0c6':
Add "tv" density for 720p screens.
Dianne Hackborn [Fri, 27 May 2011 21:23:11 +0000 (14:23 -0700)]
am
b96cbbd1: Add "tv" density for 720p screens.
* commit '
b96cbbd11c4590bec846212c33361e02293f18b5':
Add "tv" density for 720p screens.
Dianne Hackborn [Fri, 27 May 2011 20:40:26 +0000 (13:40 -0700)]
Add "tv" density for 720p screens.
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
Dianne Hackborn [Fri, 27 May 2011 19:47:59 +0000 (12:47 -0700)]
am
c058d386: am
ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit '
c058d38602a1ffe00e14b4ab32c876c252eabe6d':
Small fixes and cleanup of resource config handling.
Dianne Hackborn [Fri, 27 May 2011 19:42:56 +0000 (12:42 -0700)]
am
ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit '
ff7622992f39d8e401ab23c5ce6a84f318906e52':
Small fixes and cleanup of resource config handling.
Dianne Hackborn [Fri, 27 May 2011 19:40:39 +0000 (12:40 -0700)]
Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
Dianne Hackborn [Fri, 27 May 2011 19:09:11 +0000 (12:09 -0700)]
Small fixes and cleanup of resource config handling.
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
James Dong [Fri, 27 May 2011 18:33:26 +0000 (11:33 -0700)]
am
6c2db6fb: am
95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '
6c2db6fb1925f291cc9748cf3bf0897b9001c972':
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
James Dong [Fri, 27 May 2011 18:29:46 +0000 (11:29 -0700)]
am
95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '
95f397adb13aa69b15b53bb089078d4dbdb269f1':
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
James Dong [Fri, 27 May 2011 18:26:24 +0000 (11:26 -0700)]
Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
James Dong [Fri, 27 May 2011 18:17:39 +0000 (11:17 -0700)]
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
This reverts commit
e324197ecd14591d7db0572f50c0d21bbd269bb4.
Tadashi G. Takaoka [Fri, 27 May 2011 17:55:23 +0000 (10:55 -0700)]
am
e0a82fcc: am
241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '
e0a82fcc6058e6297d11a040aae13e37a2439c14':
Fix InputType determination of WebTextView (DO NOT MERGE)
Scott Main [Fri, 27 May 2011 17:49:33 +0000 (10:49 -0700)]
am
de43d71b: am
f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit '
de43d71bee336874a756545468d9adcf5e96e421':
docs: adjust what's visible for online and offline docs
Tadashi G. Takaoka [Fri, 27 May 2011 17:48:52 +0000 (10:48 -0700)]
am
241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '
241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
Fix InputType determination of WebTextView (DO NOT MERGE)
Tadashi G. Takaoka [Fri, 27 May 2011 17:47:12 +0000 (10:47 -0700)]
Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 17:23:01 +0000 (10:23 -0700)]
am
f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit '
f128d5d49b95971d580b07dfdbeb513a0eb3d2df':
docs: adjust what's visible for online and offline docs
Scott Main [Fri, 27 May 2011 17:17:41 +0000 (10:17 -0700)]
Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 16:53:27 +0000 (09:53 -0700)]
docs: adjust what's visible for online and offline docs
Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Tadashi G. Takaoka [Fri, 27 May 2011 12:53:52 +0000 (21:53 +0900)]
Fix InputType determination of WebTextView (DO NOT MERGE)
The InpuType from <input type="email" /> has been broken.
Change-Id: Ie37de69682410cdd58c29910d483e924f5b614b6
Related-Bug:
4490948
Cherry-pick: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
Wink Saville [Fri, 27 May 2011 16:15:19 +0000 (09:15 -0700)]
am
178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
* commit '
178b066096d94f078fdb32bf9f66755bae34819d':
DataConnection FailCause should use errorCode rather than ordinal.
Wink Saville [Fri, 27 May 2011 16:03:48 +0000 (09:03 -0700)]
Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
Ramesh Sudini [Fri, 27 May 2011 14:23:01 +0000 (09:23 -0500)]
DataConnection FailCause should use errorCode rather than ordinal.
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
Wink Saville [Fri, 27 May 2011 01:23:17 +0000 (18:23 -0700)]
am
885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
* commit '
885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
DataConnection : Have a separate alarm for each APN type.
Wink Saville [Fri, 27 May 2011 01:21:29 +0000 (18:21 -0700)]
am
e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
* commit '
e55e5e7c406bdedc67c6e536c981146e2b335b43':
Derive ICC status from multiple application status for UICC
Wink Saville [Fri, 27 May 2011 01:19:08 +0000 (18:19 -0700)]
Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
Wink Saville [Fri, 27 May 2011 01:18:52 +0000 (18:18 -0700)]
Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
Dianne Hackborn [Fri, 27 May 2011 00:12:36 +0000 (17:12 -0700)]
am
8fcbfb52: am
94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '
8fcbfb52607263754b6d3895a112f792c5c3a12e':
Add new supports-screens attributes for declaring the compatible screens.
Dianne Hackborn [Fri, 27 May 2011 00:09:39 +0000 (17:09 -0700)]
am
94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '
94250ac69c6e07534e4781d3479dccb79d8c366c':
Add new supports-screens attributes for declaring the compatible screens.
Kazuhiro Ondo [Thu, 26 May 2011 21:43:10 +0000 (16:43 -0500)]
Derive ICC status from multiple application status for UICC
If UICC with multiple applications are used, delive the status
based on both status instead of just looking at one.
Change-Id: I98cf689327e5302bb4174985935511aff02939f6
Ramesh Sudini [Thu, 26 May 2011 22:03:42 +0000 (17:03 -0500)]
DataConnection : Have a separate alarm for each APN type.
Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
Dianne Hackborn [Fri, 27 May 2011 00:07:52 +0000 (17:07 -0700)]
Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
Romain Guy [Fri, 27 May 2011 00:00:14 +0000 (17:00 -0700)]
am
a33bb164: am
4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
* commit '
a33bb164b2ac792d5bba76ba198fb052197fd520':
DO NOT MERGE Correctly implement the CLEAR xfermode.
Romain Guy [Thu, 26 May 2011 23:57:18 +0000 (16:57 -0700)]
am
4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
* commit '
4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e':
DO NOT MERGE Correctly implement the CLEAR xfermode.
Romain Guy [Thu, 26 May 2011 23:55:33 +0000 (16:55 -0700)]
Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
Romain Guy [Thu, 26 May 2011 23:51:47 +0000 (16:51 -0700)]
DO NOT MERGE Correctly implement the CLEAR xfermode.
This bug is a regression from the software pipeline and prevents
applications from implementing an "eraser" type tool (for instance
a drawing/painting apps.) This issue affects external applications
when they turn on hardware acceleration.
The previous implementation was using glBlendFunc with the parameters
GL_ZERO/GL_ZERO which doesn't work for text, paths and other alpha
sources (anti-aliasing.) The correct implementation is GL_ZERO/
GL_ONE_MINUS_SRC_ALPHA.
Change-Id: I1446e83480e46174b880120069d76fcad14ba300
Gilles Debunne [Thu, 26 May 2011 22:50:13 +0000 (15:50 -0700)]
am
4ce6822b: am
24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit '
4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
ExternalStorageFormatter takes an optional StorageVolume target.
Gilles Debunne [Thu, 26 May 2011 22:47:14 +0000 (15:47 -0700)]
am
24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit '
24de44a1877be3e5d63697f90c98a87a4d88b1fb':
ExternalStorageFormatter takes an optional StorageVolume target.
Gilles Debunne [Thu, 26 May 2011 22:44:18 +0000 (15:44 -0700)]
Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
Scott Main [Thu, 26 May 2011 22:31:13 +0000 (15:31 -0700)]
am
f18348b1: am
a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
* commit '
f18348b1225926435ddfa505192a7462208be0ca':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
Scott Main [Thu, 26 May 2011 22:31:10 +0000 (15:31 -0700)]
am
70f45917: am
f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
* commit '
70f4591762a0ca0fca71ebfe156a8916b0a9475c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
Scott Main [Thu, 26 May 2011 22:31:07 +0000 (15:31 -0700)]
am
b7cfc618: am
28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
* commit '
b7cfc6181be090cc93d304a96e035f5a754085ae':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
Scott Main [Thu, 26 May 2011 22:26:28 +0000 (15:26 -0700)]
am
a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
* commit '
a22721301181fb995559d5badd9d286803a0ec86':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
Scott Main [Thu, 26 May 2011 22:23:49 +0000 (15:23 -0700)]
am
f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
* commit '
f5d8ceae68993e3af9905e58c8c6bdf90872880c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
Scott Main [Wed, 25 May 2011 00:17:27 +0000 (17:17 -0700)]
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2
docs: fix typo and slight revision
Change-Id: I33ec5fef9f04dad6deae5681571c36bf70205569
Scott Main [Thu, 26 May 2011 22:21:34 +0000 (15:21 -0700)]
am
28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
* commit '
28fb09e0b27a97e4664c9a31a3c72a067794b4c6':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
Scott Main [Wed, 25 May 2011 00:11:55 +0000 (17:11 -0700)]
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5
docs: fix markup and typos
Change-Id: Ib0c5a0b41bfa2e9faef9b9b8e2cad8a69e6e1c8b
Scott Main [Tue, 24 May 2011 00:27:17 +0000 (17:27 -0700)]
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262
docs: add document for the compatibility library
Change-Id: I1825ae1fba0be664a7c6a8b0ba32166f216a893f
Dianne Hackborn [Thu, 26 May 2011 21:20:23 +0000 (14:20 -0700)]
Add new supports-screens attributes for declaring the compatible screens.
Change-Id: I40d57e4354e48accc1027c9f90916ea73eb5190d
android:requiresSmallestWidthDp provides the smallest supported width.
android:compatibleWidthLimitDp provides the largest compatible width.
Adam Powell [Thu, 26 May 2011 21:14:50 +0000 (14:14 -0700)]
am
47dae694: am
7eba403e: Merge "DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '
47dae694d7476e8a3de1e9b487b89e003b8440b1':
DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
Kenny Root [Thu, 26 May 2011 21:14:48 +0000 (14:14 -0700)]
am
5e34a194: am
1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
* commit '
5e34a1945a6b26dff5551a37627c5216b076d896':
Break apart queries to getInstalled* API DO NOT MERGE
Scott Main [Thu, 26 May 2011 21:14:45 +0000 (14:14 -0700)]
am
101139cc: am
c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
* commit '
101139cc8f5b975dfacf1a2ffd3bdae8e3907f65':
DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
Dianne Hackborn [Thu, 26 May 2011 21:14:41 +0000 (14:14 -0700)]
Dianne Hackborn [Thu, 26 May 2011 21:14:35 +0000 (14:14 -0700)]
am
d5238cc1: am
7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '
d5238cc1ab8366389b2aada228f2f2e5cbb3244e':
Rework how we decide whether to use system or status bar.
Eric Fischer [Thu, 26 May 2011 21:14:31 +0000 (14:14 -0700)]
am
90856661: am
66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
90856661cf07453a23c3737f421a4686b70d95c1':
Import revised translations. DO NOT MERGE
Adam Powell [Thu, 26 May 2011 20:34:45 +0000 (13:34 -0700)]
am
7eba403e: Merge "DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '
7eba403e9a64f7153b7e5788902d4f799739158e':
DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
Kenny Root [Thu, 26 May 2011 20:34:42 +0000 (13:34 -0700)]
am
1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
* commit '
1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
Break apart queries to getInstalled* API DO NOT MERGE
Scott Main [Thu, 26 May 2011 20:34:40 +0000 (13:34 -0700)]
am
c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
* commit '
c31239616cca417e71acb98813df7eda645835df':
DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
Dianne Hackborn [Thu, 26 May 2011 20:34:37 +0000 (13:34 -0700)]
Dianne Hackborn [Thu, 26 May 2011 20:34:33 +0000 (13:34 -0700)]
am
7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '
7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
Rework how we decide whether to use system or status bar.
Eric Fischer [Thu, 26 May 2011 20:34:29 +0000 (13:34 -0700)]
am
66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
66fd9ab236b3df85a32792caec41a2cd83622e28':
Import revised translations. DO NOT MERGE
Adam Powell [Thu, 26 May 2011 20:26:33 +0000 (13:26 -0700)]
Merge "DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
Adam Powell [Thu, 26 May 2011 20:21:32 +0000 (13:21 -0700)]
DO NOT MERGE - Fix bug
4489946 - Remove placeholder views for phones
in smaller-screen decor layouts.
Keep the internal id declared to keep code in sync with downstream
branches.
Change-Id: I25d2ff7c40c220ecc93b195dfd4e953fe0b4d944
Kenny Root [Thu, 26 May 2011 20:10:23 +0000 (13:10 -0700)]
Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
Simon Wilson [Thu, 26 May 2011 19:50:33 +0000 (12:50 -0700)]
resolved conflicts for merge of
a38fad37 to honeycomb-plus-aosp
Conflicts:
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
Scott Main [Tue, 24 May 2011 23:55:56 +0000 (16:55 -0700)]
DO NOT MERGE
cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662
docs: add accepted values for setting status bar visibility
Change-Id: I255dcd62b71c1b4ca40187b395abce8d6836c249
Gilles Debunne [Wed, 25 May 2011 23:27:13 +0000 (16:27 -0700)]
ExternalStorageFormatter takes an optional StorageVolume target.
Change-Id: Ic85689659dbf49a7fcc1b7aaf25e4a94e62848b9
Dianne Hackborn [Thu, 26 May 2011 18:45:00 +0000 (11:45 -0700)]
I am a dummy.
Change-Id: Ie6908a8931954f83ab0e9b905173b576dbf3661d
Dianne Hackborn [Thu, 26 May 2011 18:39:22 +0000 (11:39 -0700)]
Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
Eric Fischer [Thu, 26 May 2011 18:36:58 +0000 (11:36 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Eric Fischer [Thu, 26 May 2011 18:23:32 +0000 (11:23 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I596d69bead9553185fd835c79123f354a06b3d5b
Wink Saville [Thu, 26 May 2011 18:07:18 +0000 (11:07 -0700)]
am
f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
* commit '
f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
Remove or disable some verbose debugging.
Dianne Hackborn [Thu, 26 May 2011 18:02:52 +0000 (11:02 -0700)]
am
80ef2a97: am
42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
* commit '
80ef2a9745e6103efd9698577536bbfed1fd74f6':
Spiffy new compatibility mode UI.
Wink Saville [Thu, 26 May 2011 17:55:46 +0000 (10:55 -0700)]
Merge "Remove or disable some verbose debugging." into honeycomb-LTE
Dianne Hackborn [Thu, 26 May 2011 07:55:58 +0000 (00:55 -0700)]
Rework how we decide whether to use system or status bar.
The PhoneWindowManager is now responsible for determing this,
since it needs to do this before we can generate the configuration
since we need to take into account the system bar size we will use.
Also the Display should now report the screen height without
including the system bar.
Change-Id: I82dfcc5e327e4d13d82c373c6c870f557a99b757
Dianne Hackborn [Thu, 26 May 2011 17:00:00 +0000 (10:00 -0700)]
am
42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
* commit '
42f8094c066209a65b09d53611ef5c93daba4c51':
Spiffy new compatibility mode UI.
Kenny Root [Sat, 16 Apr 2011 00:50:10 +0000 (17:50 -0700)]
Break apart queries to getInstalled* API DO NOT MERGE
To avoid blowing past the Binder IPC limit, change the
PackageManagerService to have a DB-like interaction where the client
tells the service the last "row" that it read.
The fact that we use a HashMap instead of a TreeMap makes this
problematic. For now we're just making a new ArrayList for the keys and
then sorting them for each call. This can make the API slower for callers
of this, but it's probably greatly overshadowed by the cost of the data
transfer itself.
Bug:
4064282
Change-Id: Ia3a8cdaa94581ed9336f2e05694b8c8a5f757bce
Wink Saville [Thu, 26 May 2011 13:36:08 +0000 (06:36 -0700)]
Remove or disable some verbose debugging.
Change-Id: I930689502f2a76bf72e315331d66a9259135c6b8
Dianne Hackborn [Thu, 26 May 2011 04:18:36 +0000 (21:18 -0700)]
Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
Dianne Hackborn [Thu, 26 May 2011 04:00:46 +0000 (21:00 -0700)]
Spiffy new compatibility mode UI.
Change-Id: I1207eaafae59a434fcc979ad60a83e2d685288af
Jeff Brown [Thu, 26 May 2011 02:19:01 +0000 (19:19 -0700)]
am
a4e74744: am
fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '
a4e747445ac0bdd2cc561802c9c7abfedbd0d981':
Touch pad UX improvements.
Jeff Brown [Thu, 26 May 2011 02:16:39 +0000 (19:16 -0700)]
am
fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '
fa574c0e0ce7f84eea34e96dededea35329dbd18':
Touch pad UX improvements.
Jeff Brown [Thu, 26 May 2011 02:15:24 +0000 (19:15 -0700)]
Merge "Touch pad UX improvements." into honeycomb-mr2
OSDN Git Service
