16609 Commits

Author SHA1 Message Date
Dianne Hackborn
3c43ced841 resolved conflicts for merge of d247ee41 to master
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
2011-06-03 16:16:55 -07:00
Jeff Brown
ccfcf3ba6c Merge "resolved conflicts for merge of ca2b552d to master" 2011-06-03 15:51:56 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
2011-06-03 15:50:27 -07:00
John Reck
5944b6a42b Merge "Prevent WebKit updates in loadViewState case" 2011-06-03 15:46:35 -07:00
John Reck
95b7d6f9c2 Prevent WebKit updates in loadViewState case
Change-Id: I466f10c308b43f8683e537620e1c3e922a2cd465
2011-06-03 15:36:25 -07:00
Dianne Hackborn
9468634987 Merge "resolved conflicts for merge of cc20b4e3 to master" 2011-06-03 15:24:20 -07:00
John Reck
5e02e09565 Merge "Initial support for view state serialization" 2011-06-03 15:21:16 -07:00
Dianne Hackborn
ead40eaedb resolved conflicts for merge of cc20b4e3 to master
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
2011-06-03 15:01:49 -07:00
Dianne Hackborn
2515db74fe am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
  Work around OpenFeint bug.
2011-06-03 14:43:18 -07:00
Fabrice Di Meglio
ce08f78560 Merge "Fix default TextView gravity" 2011-06-03 14:37:23 -07:00
Fabrice Di Meglio
ea28694aee Fix default TextView gravity
- default set to Gravity.TOP | Gravity.BEFORE instead of Gravity.TOP | Gravity.LEFT

Change-Id: I5e528fb1d0a6e3c84dd506e899df33c9b58d25f3
2011-06-03 14:29:45 -07:00
Adam Powell
b93ffdb5d5 am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit 'b30dda6b550fedcf5c3b15671d483205a7757e1b':
  Framework: bugfix for menu selector not showing up properly.
2011-06-03 14:28:26 -07:00
Dianne Hackborn
9f2f3752ae am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit 'c11f6c3e33c9f1e3964cb2427f82509fc97e3527':
  Compatibility mode never needed for normal size screens.
2011-06-03 14:28:18 -07:00
Dianne Hackborn
678d344bcb resolved conflicts for merge of b9e2f68b to master
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
2011-06-03 14:15:10 -07:00
Philip Milne
160cbbb9ac Merge "Response to code review for GridLayout:" 2011-06-03 13:46:34 -07:00
Philip Milne
aa616f31fe Response to code review for GridLayout:
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.

Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
2011-06-03 13:22:52 -07:00
Dianne Hackborn
455591b913 am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit 'c691d7f9a3621d5ef9b9d48e95c644a318b36322':
  Forgot this file.
2011-06-03 13:17:45 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-06-03 13:17:00 -07:00
John Reck
816c0defc7 Initial support for view state serialization
Framework for serializing the view state
 Still needs to prevent sending messages to webkit (pinch
 zoom doesn't work correctly as a result)

Change-Id: Ic3f8fe19b27ff1f841b556e87f582dab2a6d903b
2011-06-03 11:47:56 -07:00
Amith Yamasani
99ce8abc3f am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
  Use Holo background and proper padding for App Permissions UI.
2011-06-03 11:11:22 -07:00
Derek Sollenberger
df0d966d67 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4b1b27a798 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -07:00
satok
b1b2e2275f Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07:00
Dianne Hackborn
d247ee41d6 am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
  Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:33:22 -07:00
Dianne Hackborn
758b67b123 am b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:30:34 -07:00
Dianne Hackborn
b46ed7636b Add new Fragment API for explicitly saving/restoring state.
Also fix issue #4519821:
Blank screen displayed on tapping "Battery Use" option in the settings

We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.

And fix a fragment problem where we still weren't correctly restoring
the state of list views.  (I think this was from a bad manual-merge
from master.)

Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
2011-06-02 19:18:07 -07:00
Jeff Brown
ca2b552d98 am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'c8812761609e532cceb400b112ed9982149c2490':
  Add a preference panel for mouse speed.
2011-06-02 17:34:03 -07:00
Jeff Brown
c881276160 am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
  Add a preference panel for mouse speed.
2011-06-02 17:28:07 -07:00
Daniel Lehmann
fb771d1ecc Merge "Remove the obsolete function that is not used anymore" 2011-06-02 16:59:10 -07:00
Dianne Hackborn
7dad2c24fa am 9b94aa18: am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '9b94aa18f78e6c6281202e72b5a7451bc479fe82':
  Fix compat mode bugs when updating apps.
2011-06-02 16:50:13 -07:00
Dianne Hackborn
8a7d44e824 resolved conflicts for merge of 54cb63e2 to master
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
2011-06-02 16:44:52 -07:00
Dianne Hackborn
0e5e16a656 am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit 'da9837fb61c8aa53c67921682016d97655332089':
  Small fixes and cleanup of resource config handling.
2011-06-02 16:24:12 -07:00
Fabrice Di Meglio
a1908aa05c Merge "Improve ViewDebug informations for View and LineaLayout" 2011-06-02 16:15:01 -07:00
Fabrice Di Meglio
bce84d2bca Improve ViewDebug informations for View and LineaLayout
Change-Id: Ie34519c975027dead806b7859b638d78c39ace77
2011-06-02 15:57:01 -07:00
Jeff Brown
1a84fd1fb7 Add a preference panel for mouse speed.
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
2011-06-02 15:39:21 -07:00
Dianne Hackborn
98c6870e0e Merge "resolved conflicts for merge of 5c2e4d20 to master" 2011-06-02 15:04:36 -07:00
Romain Guy
4b2711372d Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG." 2011-06-02 14:49:28 -07:00
Shimeng (Simon) Wang
f32d43b294 Merge "Make sure scale will not go beyond overview scale after rotation." 2011-06-02 14:41:58 -07:00
Romain Guy
6f7d9394ec Take advantage of EGL_BUFFER_PRESERVED on IMG.
The IMG architecture does not support the EGL_SWAP_BEHAVIOR_PRESERVED_BIT
in EGL configurations. This bit is used only to be able to change the
EGL_SWAP_BEHAVIOR, which matters when the default behavior is not the
one we want. However on IMG, the default swap behavior is the one we
desire.

Change-Id: Iff5980c97df9e41bc837e424baf83b8eadbb7161
2011-06-02 14:30:06 -07:00
Dianne Hackborn
546d64f56d resolved conflicts for merge of 5c2e4d20 to master
Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
2011-06-02 14:29:13 -07:00
Shimeng (Simon) Wang
ebf762777a Make sure scale will not go beyond overview scale after rotation.
Change-Id: If8f7fe131814102e6abf5c8d59888d17a7200003
2011-06-02 14:11:57 -07:00
Gilles Debunne
c6f1f4ac3b am ca6c3a2b: am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit 'ca6c3a2bba4445f492117697cb304a014a185159':
  ExternalStorageFormatter takes an optional StorageVolume target.
2011-06-02 14:06:11 -07:00
Adam Powell
2e6053873b Merge "Handle action modes in the IME extract mode view." 2011-06-02 13:36:02 -07:00
Adam Powell
5ee36c48be Handle action modes in the IME extract mode view.
This presents action modes (such as the one for text editing) in a
less screen-consuming way in the IME extract mode layout. The submit
button is replaced by an "Edit..." button that shows the action mode
menu when clicked.

Still needs UX design and tweaking.

Change-Id: Ia7b3f3446edced0ee5a9abc5e2f0ff16f4fa3ab1
2011-06-02 13:29:37 -07:00
Albert Mojir
efc1d16374 Bluetooth: correcting return value from cancelDiscovery
BluetoothAdapter.cancelDiscovery was previously always
returning false.

Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
2011-06-02 10:30:49 -07:00
Dianne Hackborn
108a61cac5 Merge "resolved conflicts for merge of 76450622 to master" 2011-06-02 10:17:05 -07:00
Gilles Debunne
e9ff92d7d2 Merge "Remove suggestion span underline on device rotation" 2011-06-02 09:45:32 -07:00
Narayan Kamath
7a3af86dc0 Language loading / availablity should repsect defaults enforcement.
There is no point loading a language that will never be used.
It is in fact harmful, because the engine might load it and
then receive a request for the default voice and have to load
the default voice again.

Change-Id: I8082f28d15b6e325d6a39d439b66753711a2c244
2011-06-02 17:28:57 +01:00
satok
560bcb34fa Update internal states stored in InputMethodManager properly
Bug: 4517456

"startInputInner" in InputMethodManager.java will call "startInput" in InputMethodManagerService.java
In startInputLocked in IMMS, mCurSeq (Bind sequence) is incremented, but if mCurMethod stored in
InputMethodManager.java is not null, mBindSequence in InputMethodManager.java will not be updated
to the incremented sequence.

Hence, after this procedure, unbinding IME will be cancelled by the mismatch of the bind sequence.

This situation happens when user changes the focused text view.
If I remember correctly, some behaviors of showing or hiding IME at switching text view were changed.
And I think this bug appeared because of that change.

Change-Id: Icec380f3ca05cf798cc4b82155d0cecf178633a5
2011-06-03 01:23:00 +09:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
2011-06-02 09:20:52 -07:00