58643 Commits

Author SHA1 Message Date
Robert Ly
b82696fadf Merge "cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9" 2011-09-22 11:02:43 -07:00
The Android Open Source Project
ee79a53c81 Reconcile with ics-factoryrom-release
Change-Id: I5f3fe0c78905638535925d842337bffcd504a95b
2011-09-22 10:57:24 -07:00
Wink Saville
94097b44b8 am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.
2011-09-22 10:53:40 -07:00
Wink Saville
904fb9d79c Merge "Notify people of empty proxies too." into ics-factoryrom 2011-09-22 10:52:25 -07:00
Robert Ly
dec97360a5 cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9
Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: Iaaa7fc01504400e7c57955a1ee94f005d1dba056
2011-09-22 10:33:28 -07:00
Daniel Sandler
e690f565fd am 2dbe444e: Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom
* commit '2dbe444e5dd89b83829df6a3f48c491a844ecd28':
  Properly generate systemUiVisibilityChanged callbacks.
2011-09-22 10:31:49 -07:00
Daniel Sandler
7933b7056f am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
* commit 'cc22b99249ac80891af99be941862edc9569fc4b':
  Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-09-22 10:31:47 -07:00
Daniel Sandler
2dbe444e5d Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom 2011-09-22 10:29:33 -07:00
Daniel Sandler
cc22b99249 Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom 2011-09-22 10:29:31 -07:00
Fabrice Di Meglio
bedc1eb19d Merge "Bug 5279842: mis alignment after scroll" 2011-09-22 10:25:57 -07:00
Scott Main
a41074870d Merge "docs: clean the slate of newness for all side navs" 2011-09-22 10:05:49 -07:00
Scott Main
9ed517da9b docs: clean the slate of newness for all side navs
Change-Id: I0d027199168d3e0e5fd1ed243438d8dc1b150f23
2011-09-22 09:57:34 -07:00
Chet Haase
5ce348615b Merge "Fix 5335993, calculate correct size of lockscreen buttons" 2011-09-22 07:55:23 -07:00
The Android Automerger
17fc7f6ed3 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-22 06:28:37 -07:00
Ken Wakasa
9f48d6348d Fix comment
Change-Id: Ic0fd15d0b1b4d2c24eb177a6b22e0cc08ec1de99
2011-09-22 19:24:48 +09:00
Edwin Wong
013ccb7010 Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436" 2011-09-21 23:05:57 -07:00
Edwin Wong
aab6fe21df Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.
BUG: 5284436

Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
2011-09-21 21:50:31 -07:00
Jeff Brown
b35914bb90 Merge "Disallow 180 rotation for phones. Bug: 4981385" 2011-09-21 21:09:15 -07:00
Jeff Brown
a829e16681 Merge "Handle orientation changes more systematically. Bug: 4981385" 2011-09-21 21:09:10 -07:00
Jeff Brown
d3187e39b0 Disallow 180 rotation for phones.
Bug: 4981385

Change-Id: Icaed9cfe4ee9771ca5951abcd1173024d87a024b
2011-09-21 19:26:44 -07:00
Jeff Brown
01a98ddbdf Handle orientation changes more systematically.
Bug: 4981385

Simplify the orientation changing code path in the
WindowManager.  Instead of the policy calling setRotation()
when the sensor determined orientation changes, it calls
updateRotation(), which figures everything out.  For the most
part, the rotation actually passed to setRotation() was
more or less ignored and just added confusion, particularly
when handling deferred orientation changes.

Ensure that 180 degree rotations are disallowed even when
the application specifies SCREEN_ORIENTATION_SENSOR_*.
These rotations are only enabled when docked upside-down for
some reason or when the application specifies
SCREEN_ORIENTATION_FULL_SENSOR.

Ensure that special modes like HDMI connected, lid switch,
dock and rotation lock all cause the sensor to be ignored
even when the application asks for sensor-based orientation
changes.  The sensor is not relevant in these modes because
some external factor (or the user) is determining the
preferred rotation.

Currently, applications can still override the preferred
rotation even when there are special modes in play that
might say otherwise.  We could tweak this so that some
special modes trump application choices completely
(resulting in a letter-boxed application, perhaps).
I tested this sort of tweak (not included in the patch)
and it seems to work fine, including transitions between
applications with varying orientation.

Delete dead code related to animFlags.

Handle pausing/resuming orientation changes more precisely.
Ensure that a deferred orientation change is performed when
a drag completes, even if endDragLw() is not called because the
drag was aborted before the drop happened.  We pause
the orientation change in register() and resume in unregister()
because those methods appear to always be called as needed.

Change-Id: If0a31de3d057251e581fdee64819f2b19e676e9a
2011-09-21 19:26:15 -07:00
Svetoslav Ganov
df8e00ff33 am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
* commit '624181af38f7f9e4fe4a18ca3e15204f30609312':
  Settings are restored in alphabetical order rather in order of dependency.
2011-09-21 19:08:28 -07:00
Gilles Debunne
b2beb92073 Bug 5279842: mis alignment after scroll
Refactored.

Original problem was the ALIGN_RIGHT case that was not handled.

Change-Id: Id01b75ac404b7ee92143e8cf6e3a3a838b794da8
2011-09-21 19:08:02 -07:00
Svetoslav Ganov
624181af38 Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom 2011-09-21 19:06:26 -07:00
Jaikumar Ganesh
a0c7ec2b5a am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
* commit '90fb9aa93a350d5571a378923c2566f48e44ad3e':
  Make Bluetooth Health constant public.
2011-09-21 18:57:00 -07:00
Kenny Root
0d3647dc00 am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
* commit '9c711282ad234e104c34eb4408d85fc1bb149ded':
  Unhide new PackageManager APIs for API 14
2011-09-21 18:56:52 -07:00
Justin Ho
67ceaf3e83 am 22aa7805: Merge "Thinner clock font" into ics-factoryrom
* commit '22aa7805dd0d9bf1c31b5cff526fda793477d8a7':
  Thinner clock font
2011-09-21 18:56:50 -07:00
John Wang
5dbe9228a9 am 6588bba3: Merge "Notify the sim state after callback registration." into ics-factoryrom
* commit '6588bba33fbf2756253d19764022a743e13573e9':
  Notify the sim state after callback registration.
2011-09-21 18:56:49 -07:00
John Wang
19662a6a08 am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
* commit '27b402abe5c24a3e21a39458541001ea91465b8f':
  Set enable_puk_unlock_screen true by default.
2011-09-21 18:56:47 -07:00
Adam Powell
c3e4454fdb Merge "Fix bug 5300621 - Share menu disappears in gallery" 2011-09-21 18:26:13 -07:00
Svetoslav Ganov
a571a5836c Settings are restored in alphabetical order rather in order of dependency.
Settings were restore in alphabetical order and capturing dependency
among them required keys to be chosen in such a way that after sorting
they apprear in dependency order. Now settings are exported and restored
in the order they are declared in the arrays of settings to backup.
Hence, the order in this array will capture the dependency order.

bug:5343351

Change-Id: I93a40bcdd194943cd6f85aa18f1557d546e38274
2011-09-21 18:21:24 -07:00
Scott Main
abb06265ef update version codes for doc filtering and footer version name
Change-Id: I63feac1e5dcf7c0f7f2acc3ff23fcd3224a90e14
2011-09-21 18:09:25 -07:00
Jaikumar Ganesh
90fb9aa93a Merge "Make Bluetooth Health constant public." into ics-factoryrom 2011-09-21 17:44:32 -07:00
Adam Powell
823f074a73 Fix bug 5300621 - Share menu disappears in gallery
ActionProviders (or action views) unfortunately had no way to report
that they had opened a sub-UI that would affect menu visibility
listeners used to hide action bars when not in use. This caused the
Gallery UI to hide its action bar when the share popup was open.

Add hidden API (to be made public later) to ActionProvider that can be
used to inform the menu system that a sub UI has opened or
closed. Account for this in menu visibility callbacks. Fix
ShareActionProvider to use this when its popup windows open and close.

Fix a regression where submenus were not properly reporting visibility
changes.

Change-Id: Ia6f45fb463ad106105c40d01f141c2e5c8b96f78
2011-09-21 17:21:47 -07:00
Robert Greenwalt
0e09082559 Notify people of empty proxies too.
We were telling people when the proxy changed, except if it was changed to null.
bug:5263946

Change-Id: I83416dac8fe992168a8aafd5676f9faee4e484d0
2011-09-21 16:37:34 -07:00
Kenny Root
9c711282ad Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom 2011-09-21 16:35:52 -07:00
Dianne Hackborn
04ef5b8dd7 Merge "Fix issue #5253941: ICS ignoring provider's android:process flag" 2011-09-21 16:19:45 -07:00
Dianne Hackborn
6bba4afaa4 Merge "Improvements to power manager turning on screen." 2011-09-21 16:18:38 -07:00
Jaikumar Ganesh
fd966a124f Make Bluetooth Health constant public.
Change-Id: I366f1231056fe978d85ee80c773d5911badb22e2
2011-09-21 16:03:42 -07:00
Justin Ho
22aa7805dd Merge "Thinner clock font" into ics-factoryrom 2011-09-21 15:38:56 -07:00
Justin Ho
6665333d65 Thinner clock font
Change-Id: I37fd911ea9ae90dba34c1ec285cb4c804678b5ac
2011-09-21 15:37:42 -07:00
John Wang
6588bba33f Merge "Notify the sim state after callback registration." into ics-factoryrom 2011-09-21 15:34:28 -07:00
John Wang
27b402abe5 Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom 2011-09-21 15:32:39 -07:00
John Wang
5209864a2b Set enable_puk_unlock_screen true by default.
Make pukUnlockScreen the default way to enter PUK ocde.
There are two ways to enter PUK code, pukUnlockScreen UI
and MMI Code for Emergency Dialer. As far as we know most
of carriers are fine with either one though they may prefer
pukUnlockScreen UI. It can be overwrite if specific device or
carrier don't want to show pukUnlockSreen UI.

Note the Emergency Dialer will not show up
if the device is not voice capable. Another reason to make
pukUnlockSreen UI enable as default.

bug:5243771
Change-Id: I141324bef6ab812243a6cbb89870f71c60e838ec
2011-09-21 15:23:34 -07:00
Mangesh Ghiware
f2bf48b7c6 Merge "Use overview scale when restored scale is 0." 2011-09-21 15:20:03 -07:00
Dianne Hackborn
dda868cd33 Merge "Keyguard sound needs to hold wake lock." 2011-09-21 15:15:18 -07:00
Dianne Hackborn
2a6bcda03b Fix issue #5253941: ICS ignoring provider's android:process flag
Provider was not being removed from the class map because it was using
the wrong key.  D'oh.

Also a little cleanup.

Change-Id: I318e8b1a265318ac1474e0a7f14f27f89f357505
2011-09-21 15:07:05 -07:00
Mangesh Ghiware
faab93d1ac Use overview scale when restored scale is 0.
If restored scale and text wrap scale are set to 0 (meaning the previous
scale wasn't saved), set them to overview and reading level scale
respectively.

Bug: 5230909
Change-Id: If7724e9a0cd948c88d0a001728266a3282083bdc
2011-09-21 14:57:11 -07:00
John Wang
61e159504a Notify the sim state after callback registration.
Notify the register the current sim state right away in
registerSimStateCallback.Otherwise the register won't
receive any state until sim state gets changed again.
That will introduce a racing condition. If the sim state
changes to PUK_LOCKED after registering the callback, the
PUK unlock screen shows up. If the sim state changes to
PUK_LOCKED before registering, the PUK unlock screen won't
show.

bug:5243771
Change-Id: I27de1329a30adba68952cf086d2130c4cef54270
2011-09-21 14:35:34 -07:00
Wink Saville
d30f73725b am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
* commit '4aa8d943a970008915b703758743b107927d96fa':
  Reduce connectivity logging
2011-09-21 14:14:28 -07:00