4272 Commits

Author SHA1 Message Date
Jeff Brown
db10a638fd am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
  Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Jeff Brown
c8276990df Merge "Add volume down as a safe mode key for Stingray." into honeycomb 2011-01-14 17:22:53 -08:00
satok
37d997f766 am fb77a336: am 604363dc: Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb
* commit 'fb77a336af46ceb5a718c5ee7fc34da4b4a06f2a':
  switchToLastInputMethod returns a implicitly enabled subtype in the history
2011-01-14 15:40:26 -08:00
satok
df31ae6a30 switchToLastInputMethod returns a implicitly enabled subtype in the history
Bug: 3353363

Change-Id: Id5f8a62017880330401ebd3e77d943eb7817e555
2011-01-15 08:34:39 +09:00
Jeff Brown
53183aeb35 am 9781071a: am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
* commit '9781071ae704c9370901e248f1f5bc79fcefc3c7':
  Use holo style mouse pointer.
2011-01-14 13:13:03 -08:00
Kenny Root
8470165e6e am 014ef618: am bd392c53: Check for null in PackageSetting constructor
* commit '014ef61842dd877b60cb16d433ecff9165944fd8':
  Check for null in PackageSetting constructor
2011-01-14 13:12:54 -08:00
Jeff Brown
909733cdeb Use holo style mouse pointer.
Change-Id: I17df431075c8ffec3ade151c6c85ec34ad8397dd
2011-01-14 13:02:40 -08:00
Kenny Root
bd392c5397 Check for null in PackageSetting constructor
Should bring honeycomb into parity with gingerbread changes.

Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84
2011-01-14 12:58:12 -08:00
Brad Fitzpatrick
39f35f0a62 am 9dde087d: am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
* commit '9dde087dcb94341bd2b66e186534dc44e660a2ce':
  Watchdog can get deadlocked on activity manager
2011-01-14 12:51:57 -08:00
Brad Fitzpatrick
1e8d23f6b0 Merge "Watchdog can get deadlocked on activity manager" into honeycomb 2011-01-14 12:48:08 -08:00
Kenny Root
27b775a62d am d9fa11b4: am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
* commit 'd9fa11b446da5dbc92776518c20bab1f04e55537':
  Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:46:34 -08:00
Kenny Root
312206b987 Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb 2011-01-14 12:42:12 -08:00
Kenny Root
5d40fe9c68 Add the {get,set}PackageObbPaths calls to API
Add getPackageObbPaths() and setPackageObbPaths() to the public API.

Bug: 3214719
Change-Id: I8627b5f674a795d5780eb5c08911419110670a41
2011-01-14 12:18:48 -08:00
satok
637ccd49ed am b3b1509d: am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
* commit 'b3b1509de73e61296d4fae5ee7e065915ffd4109':
  Add input methods settings panel
2011-01-14 12:07:24 -08:00
satok
82beadfa06 Add input methods settings panel
Bug: 3141466
Bug: 3301559
Bug: 3284424

Moved from old master I4d9abeea

Change-Id: I62fa64cc095e1b9ac34f21e7d4d2e0bb8a3e68fc
2011-01-15 05:00:51 +09:00
Brad Fitzpatrick
9765c72eea Watchdog can get deadlocked on activity manager
Bug: 3351719
Change-Id: Ie5bb39e5ff92f41c14ae59240173fab9c2491a91
2011-01-14 11:47:01 -08:00
satok
aefc622d69 am a4bb5c1e: am 15572ff6: Merge "Save input method subtype even if the current IME is not running." into honeycomb
* commit 'a4bb5c1e29bc479ff571d22d89f47503c11b5f8b':
  Save input method subtype even if the current IME is not running.
2011-01-14 00:17:23 -08:00
satok
15572ff6e5 Merge "Save input method subtype even if the current IME is not running." into honeycomb 2011-01-14 00:13:16 -08:00
satok
ca83021e35 Save input method subtype even if the current IME is not running.
Bug: 3325103
Change-Id: I6dfd19a0d494526cdb4cfb4230a5376ce94ca94a
2011-01-14 17:06:53 +09:00
Jeff Brown
b09abc1dd2 Add volume down as a safe mode key for Stingray.
Fixed a race condition during startup.  We need to wait for the input
devices to actually be ready before trying to detect safe mode.

Fixed a problem during safe mode activation where we would try to add
the overlay window but the display was not initialized.  Now we do it
after the system is ready.

Bug: 3134825
Change-Id: I4c043c142ae6bf0d865c79d266d36154eaf00709
2011-01-13 21:18:16 -08:00
Dianne Hackborn
6260570382 am 002fa80d: am 84543705: Merge "Fix issue #3330037: Unnecessary orientations appear..." into honeycomb
* commit '002fa80d1ab0a85c40d0e1a9b1abaff282c028a1':
  Fix issue #3330037: Unnecessary orientations appear...
2011-01-13 21:17:50 -08:00
Dianne Hackborn
8454370513 Merge "Fix issue #3330037: Unnecessary orientations appear..." into honeycomb 2011-01-13 21:14:12 -08:00
Dianne Hackborn
94cb2ebfc3 Fix issue #3330037: Unnecessary orientations appear...
...when the device's physical orientation is portrait.

We now hold off on computing app token orientation while preparing
to open or close app tokens.

Also clean up a few other little issues.

Change-Id: Iae125a975c7706fb4d068c872fd172e69854ff15
2011-01-13 21:11:09 -08:00
Jeff Brown
e74330f324 am 4f7a2d45: am 370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
* commit '4f7a2d45f47c72a20888719d711f734ee5a90546':
  Fix NPE in interceptKeyBeforeDispatching.
2011-01-13 20:05:18 -08:00
Jeff Brown
00ae87d4fd Fix NPE in interceptKeyBeforeDispatching.
Bug: 3349786
Change-Id: Ic2f969ff8a654fdcfeca06199acca531ae5596d3
2011-01-13 19:58:24 -08:00
Kenny Root
2ab7084f31 am ce2fb189: am 402438bb: Merge "Deep clone settings for system package update" into honeycomb
* commit 'ce2fb1894210aa851946b4586cadffce68125a33':
  Deep clone settings for system package update
2011-01-13 16:59:07 -08:00
Kenny Root
402438bb40 Merge "Deep clone settings for system package update" into honeycomb 2011-01-13 16:55:00 -08:00
Kenny Root
291e78cc9c Deep clone settings for system package update
The copyFrom() method was not written to create a clone of the
PackageSetting, so just create a new constructor that actually does a
clone.

Bug: 3349588
Change-Id: I61864869154340420f005cd5120cad751de30ee8
2011-01-13 16:17:50 -08:00
Dianne Hackborn
f8b9d42f74 am b054b4c8: am 8eca7a1e: Merge "Fix issue #3153930: orphan window left on screen" into honeycomb
* commit 'b054b4c8359992c13cc73d70914bc2b5bdb724de':
  Fix issue #3153930: orphan window left on screen
2011-01-13 15:50:44 -08:00
Dianne Hackborn
8eca7a1e11 Merge "Fix issue #3153930: orphan window left on screen" into honeycomb 2011-01-13 15:45:37 -08:00
Christopher Tate
8c39fc1484 am bab84e85: am 6458202a: Merge "Suppress orientation changes during drag operations" into honeycomb
* commit 'bab84e85860234bf491edd2e64fdf42eb3d57a0a':
  Suppress orientation changes during drag operations
2011-01-13 14:24:43 -08:00
Dianne Hackborn
f99f9c5f92 Fix issue #3153930: orphan window left on screen
The problem is that if a window containing children is removed
before the children are, the children may be lost.  This change
(amongst the huge amount of new debugging code) now ensures at
this point that all children windows are removed when the parent
is.

Note that this results in a bunch of error messages now as the
client app tries to continue to do things with that child window.
This is correct, it shouldn't be doing that, and needs to be
fixed to stop it.  But at least it now can't cause the window
manager to leak surfaces.

Change-Id: I7b80dd89ff9de7cb5af1dc759cfa4b31ac29cddc
2011-01-13 14:24:16 -08:00
Christopher Tate
6458202abe Merge "Suppress orientation changes during drag operations" into honeycomb 2011-01-13 14:20:48 -08:00
Fabrice Di Meglio
242d8a78f8 am aa45d43f: am 27ac243e: Merge "Print currentDestinationString() for each backup transport" into honeycomb
* commit 'aa45d43fcb16684b93e0fad3248ce90ac130f120':
  Print currentDestinationString() for each backup transport
2011-01-13 12:49:00 -08:00
Fabrice Di Meglio
27ac243e2d Merge "Print currentDestinationString() for each backup transport" into honeycomb 2011-01-13 12:45:27 -08:00
Fabrice Di Meglio
8aac3ee086 Print currentDestinationString() for each backup transport
when doing a "adb shell dumpsys backup"

Change-Id: I9a7d080ad50b715f693f3e16cae3d6e5b1189d47
2011-01-13 12:37:44 -08:00
Jason parks
8c3dc00a7d am 4a534fa8: am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
* commit '4a534fa899e0101e26e5b670383aa357c10483b8':
  Revert "Remove the APIs for the old encryption scheme."
2011-01-13 12:21:10 -08:00
Jason parks
a3cdaa5337 Revert "Remove the APIs for the old encryption scheme."
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
2011-01-13 14:15:43 -06:00
Robert Greenwalt
255362b604 am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
  Turn off DUN connection after tethering.
2011-01-13 10:25:25 -08:00
Robert Greenwalt
495056ab67 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Jason parks
02f9acbdb4 am da6f7dbf: am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit 'da6f7dbf9f8bf90c84147dbc57b885b3ece03e81':
  Remove the APIs for the old encryption scheme.
2011-01-13 07:44:36 -08:00
Jason parks
21f62b9e46 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
ca6777b23b Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Wink Saville
49167d749f am a8aa5fb4: am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
* commit 'a8aa5fb4ad3b784034cd4972adf127f5e8f86b13':
  Initialize mOtaspMode to OTASP_UNKNOWN.
2011-01-13 06:29:06 -08:00
Wink Saville
5bf6cc0126 Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Andy Stadler
328526c975 am 199ae7dc: am 7b0f8f08: API changes to support encryption in DPM
* commit '199ae7dce11badac71c27b1d973e24387dd5f924':
  API changes to support encryption in DPM
2011-01-12 21:18:48 -08:00
Andy Stadler
7b0f8f08ac API changes to support encryption in DPM
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
  a device that does not support encryption.

NOTE: Nobody should use ACTION_START_ENCRYPTION yet.  It needs a receiver
  to be built in Settings (different CL).

Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
2011-01-12 21:11:32 -08:00
Christopher Tate
b7e7bc42f1 am 3186e0da: am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
* commit '3186e0da33256400b52024b268c9e6e048caee6c':
  Turn off debugging logspam for release
2011-01-12 20:27:21 -08:00
Christopher Tate
994ef9296a Turn off debugging logspam for release
Fixes bug 2679101

Change-Id: I94cf1b1d0b732b2030008118eff3534f0e0608f7
2011-01-12 20:06:07 -08:00
Christopher Tate
ccd24de8a9 Suppress orientation changes during drag operations
Fixes bug 3322455

Change-Id: I21d4dbc3aaf6c8ba7afcb73a823d6443c61a4d1b
2011-01-12 17:52:31 -08:00