49048 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
8ede62745f Fix input type judgment of WebTextView (DO NOT MERGE)
Bug: 4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
2011-05-31 11:24:23 +09:00
Conley Owens
1bbcc6953a am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-29 09:00:21 -07:00
Xavier Ducrohet
59e699f13d am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.
* commit '228e4716278f450a95be5addacc3c6c940668493':
  Merge 6103e22c from honeycomb-mr1. do not merge.
2011-05-29 09:00:16 -07:00
Xavier Ducrohet
311f9493df am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
2011-05-29 08:59:57 -07:00
Ed Heyl
39ddeae0b6 Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-29 08:21:53 -07:00
satok
7e2181c0de am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow screens.
* commit '93b05690ff006fa3f96ed5e09031e18d529ae794':
  Reduce the number of notification icons on narrow screens.
2011-05-28 00:06:55 -07:00
satok
93b05690ff am 5485ff61: Reduce the number of notification icons on narrow screens.
* commit '5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
  Reduce the number of notification icons on narrow screens.
2011-05-28 00:02:54 -07:00
satok
5485ff6141 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
2011-05-28 15:58:30 +09:00
Kazuhiro Ondo
a36c8f693d am 57675037: Further fix for SIM detection.
* commit '57675037aa279e715a966e2888a31c97381a5fe4':
  Further fix for SIM detection.
2011-05-27 19:32:04 -07:00
Kazuhiro Ondo
57675037aa 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
2011-05-27 18:36:05 -07:00
Dianne Hackborn
096762d6ef 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.
2011-05-27 17:16:19 -07:00
Dianne Hackborn
8075fe48bf am 78470718: Fix various places that were using the wrong display metrics.
* commit '784707187d96b731df5256c1c2adb0aaf9037239':
  Fix various places that were using the wrong display metrics.
2011-05-27 17:12:53 -07:00
Dianne Hackborn
784707187d Fix various places that were using the wrong display metrics.
Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
2011-05-27 17:09:19 -07:00
Dianne Hackborn
9b94aa18f7 am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.
* commit 'e5d377014b04022a04fd0b2b24b343d1e0ec8d2a':
  Fix compat mode bugs when updating apps.
2011-05-27 17:01:47 -07:00
Dianne Hackborn
e5d377014b am 8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
  Fix compat mode bugs when updating apps.
2011-05-27 16:58:33 -07:00
Dianne Hackborn
8ea5e1d79e 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
2011-05-27 16:49:29 -07:00
Dianne Hackborn
54cb63e26e am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.
* commit '528c49f112dce5f9687f30a9751e783196eca0c6':
  Add "tv" density for 720p screens.
2011-05-27 14:27:46 -07:00
Dianne Hackborn
528c49f112 am b96cbbd1: Add "tv" density for 720p screens.
* commit 'b96cbbd11c4590bec846212c33361e02293f18b5':
  Add "tv" density for 720p screens.
2011-05-27 14:23:11 -07:00
Dianne Hackborn
b96cbbd11c Add "tv" density for 720p screens.
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
2011-05-27 13:40:26 -07:00
Dianne Hackborn
da9837fb61 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.
2011-05-27 12:47:59 -07:00
Dianne Hackborn
c058d38602 am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit 'ff7622992f39d8e401ab23c5ce6a84f318906e52':
  Small fixes and cleanup of resource config handling.
2011-05-27 12:42:56 -07:00
Dianne Hackborn
ff7622992f Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 2011-05-27 12:40:39 -07:00
Dianne Hackborn
3904d03dd0 Small fixes and cleanup of resource config handling.
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
2011-05-27 12:09:11 -07:00
James Dong
ef9be20715 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."
2011-05-27 11:33:26 -07:00
James Dong
6c2db6fb19 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."
2011-05-27 11:29:46 -07:00
James Dong
95f397adb1 Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 2011-05-27 11:26:24 -07:00
James Dong
f1d8a30c95 Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
This reverts commit e324197ecd14591d7db0572f50c0d21bbd269bb4.
2011-05-27 11:17:39 -07:00
Tadashi G. Takaoka
ccb2bc6c15 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)
2011-05-27 10:55:23 -07:00
Scott Main
092b0bd9b6 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
2011-05-27 10:49:33 -07:00
Tadashi G. Takaoka
e0a82fcc60 am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:48:52 -07:00
Tadashi G. Takaoka
241c000cfb Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 2011-05-27 10:47:12 -07:00
Scott Main
de43d71bee 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
2011-05-27 10:23:01 -07:00
Scott Main
f128d5d49b Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2 2011-05-27 10:17:41 -07:00
Scott Main
c0324b89f5 docs: adjust what's visible for online and offline docs
Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-05-27 10:15:31 -07:00
Tadashi G. Takaoka
f7145d5d66 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
2011-05-28 01:56:25 +09:00
Wink Saville
205a2c3a3e am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
* commit '178b066096d94f078fdb32bf9f66755bae34819d':
  DataConnection FailCause should use errorCode rather than ordinal.
2011-05-27 09:15:19 -07:00
Wink Saville
178b066096 Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE 2011-05-27 09:03:48 -07:00
Ramesh Sudini
98288aa3de DataConnection FailCause should use errorCode rather than ordinal.
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
2011-05-27 08:59:20 -07:00
Wink Saville
08c00205a7 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.
2011-05-26 18:23:17 -07:00
Wink Saville
37a4069ff9 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
2011-05-26 18:21:29 -07:00
Wink Saville
885f8cd75f Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 2011-05-26 18:19:08 -07:00
Wink Saville
e55e5e7c40 Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE 2011-05-26 18:18:52 -07:00
Dianne Hackborn
5c2e4d20df 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.
2011-05-26 17:12:36 -07:00
Dianne Hackborn
8fcbfb5260 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.
2011-05-26 17:09:39 -07:00
Kazuhiro Ondo
e14a59e96c 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
2011-05-26 17:09:25 -07:00
Ramesh Sudini
69d0855ed2 DataConnection : Have a separate alarm for each APN type.
Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
2011-05-26 17:09:07 -07:00
Dianne Hackborn
94250ac69c Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 2011-05-26 17:07:52 -07:00
Romain Guy
0f667ff5e5 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.
2011-05-26 17:00:14 -07:00
Romain Guy
a33bb164b2 am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
* commit '4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e':
  DO NOT MERGE Correctly implement the CLEAR xfermode.
2011-05-26 16:57:18 -07:00
Romain Guy
4686fb8ac8 Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2 2011-05-26 16:55:33 -07:00