Robert Greenwalt
f647fd1d1d
am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
...
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
Tell the resolver what protocols to use.
2011-09-22 23:39:53 -07:00
Justin Ho
b60e98c327
am 4dfe8695: Merge "CAB assets" into ics-factoryrom
...
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
CAB assets
2011-09-22 23:39:51 -07:00
Justin Ho
e5718aaecf
am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom
...
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
Updated emergency icon on lockscreen
2011-09-22 23:39:49 -07:00
John Wang
55a1db61fd
am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom
...
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
Update PUK unlock screen.
2011-09-22 23:39:37 -07:00
Adam Cohen
8509b5e3dd
am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
...
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
Fixing emergency dialer flicker on lock screen (issue 5314293)
2011-09-22 23:39:33 -07:00
Justin Ho
53844020a9
am 31b638d4: Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom
...
* commit '31b638d40342fc9e3198f9e7f8dffaf55049c9e1':
Fix 5355659: Change chevron visuals, timing, and animated positioning
2011-09-22 23:39:31 -07:00
Mathias Agopian
059fd18396
Merge "don't clear the framebuffer when the framebuffer is not used"
2011-09-22 21:01:21 -07:00
Mathias Agopian
cfb7d090bb
Merge "fix dumpsys wording for h/w composer"
2011-09-22 21:00:49 -07:00
Mathias Agopian
cd20eb09c4
don't clear the framebuffer when the framebuffer is not used
...
when areas of the FB are undefined (transparent windows on top of
nothing), we clear those areas before composition.
however, it makes no sense to do this when the FB is not in use
(case where hwc handles all layers)
Bug: 5360529
Change-Id: If51bb669307e8419bbe1f3a89d1c88e0ec1f216c
2011-09-22 20:57:04 -07:00
Adam Powell
a8ea647182
Merge "Fix bug 5355912 - SearchView in ActionBar with Theme.Holo.Light.DarkActionBar gets black text"
2011-09-22 19:32:13 -07:00
Svetoslav Ganov
30b8af8cd7
Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown."
2011-09-22 19:08:26 -07:00
Jamie Gennis
a249f2d112
SurfaceFlinger: set layer names on SurfaceTextures
...
This change sets the SurfaceTexture name string to match that of the
layer to which it belongs.
Change-Id: Ib302d79e916a36ab1e54cb9ff477c3b857bd957b
2011-09-22 17:50:05 -07:00
Jamie Gennis
fa28c35c21
SurfaceTexture: add name support
...
This change adds support for setting a string that can be used to
identify a SurfaceTexture object in log messages.
Change-Id: Ib4ee085f36c8830dc964c05ef1654f5a55dfcd60
2011-09-22 17:49:10 -07:00
Peter Ng
133fce3ddf
Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom
2011-09-22 17:28:29 -07:00
Chia-chi Yeh
d21aed8510
Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty."
2011-09-22 17:25:27 -07:00
Scott Main
0be11ca779
Merge "docs: update Notification dev guide with info about custom notification text colors"
2011-09-22 17:18:25 -07:00
Robert Greenwalt
dfc4bb68aa
Merge "Tell the resolver what protocols to use." into ics-factoryrom
2011-09-22 16:57:43 -07:00
Justin Ho
f0463aa713
Merge "CAB assets" into ics-factoryrom
2011-09-22 16:57:03 -07:00
Justin Ho
b426261759
Merge "Updated emergency icon on lockscreen" into ics-factoryrom
2011-09-22 16:54:17 -07:00
Mathias Agopian
fc60b94db9
fix dumpsys wording for h/w composer
...
Change-Id: Iaa1094964f2fb83da491e23b9309f7690079c17e
2011-09-22 16:26:39 -07:00
John Wang
889497d1e2
Merge "Update PUK unlock screen." into ics-factoryrom
2011-09-22 15:44:40 -07:00
Adam Cohen
7533703b10
Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
2011-09-22 15:14:49 -07:00
Justin Ho
046c1b8bec
Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom
2011-09-22 15:13:13 -07:00
Dianne Hackborn
eb0fba6d23
Merge "Fix issue #5355844 : PowerManager does not call screenTurningOn after boot."
2011-09-22 15:06:23 -07:00
Robert Ly
a871bae5fc
Merge "cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f"
2011-09-22 11:02:52 -07:00
Robert Ly
4d398a8a12
Merge "cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01"
2011-09-22 11:02:47 -07:00
Robert Ly
fd94f6e0a2
Merge "cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9"
2011-09-22 11:02:43 -07:00
The Android Open Source Project
ceae51e4dd
Reconcile with ics-factoryrom-release
...
Change-Id: I5f3fe0c78905638535925d842337bffcd504a95b
2011-09-22 10:57:24 -07:00
Wink Saville
a4e4828cd1
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
47bc29ea64
Merge "Notify people of empty proxies too." into ics-factoryrom
2011-09-22 10:52:25 -07:00
Daniel Sandler
eeb12ee468
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
2f96a0c23a
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
08069e2791
Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom
2011-09-22 10:29:33 -07:00
Daniel Sandler
1a3e64f777
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
7152cd47d7
Merge "Bug 5279842: mis alignment after scroll"
2011-09-22 10:25:57 -07:00
Scott Main
9c6b9ba222
Merge "docs: clean the slate of newness for all side navs"
2011-09-22 10:05:49 -07:00
Chet Haase
138c6f6f5f
Merge "Fix 5335993, calculate correct size of lockscreen buttons"
2011-09-22 07:55:23 -07:00
The Android Automerger
5d83396e8b
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-22 06:28:37 -07:00
Edwin Wong
a939526ae8
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
Jeff Brown
245138ad55
Merge "Disallow 180 rotation for phones. Bug: 4981385"
2011-09-21 21:09:15 -07:00
Jeff Brown
701e51ac7e
Merge "Handle orientation changes more systematically. Bug: 4981385"
2011-09-21 21:09:10 -07:00
Jeff Brown
21230c6410
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
bf0613e733
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
Svetoslav Ganov
b0ebc84fa6
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
4317643963
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
e20a7f206c
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
2d4c24e6b5
am 22aa7805: Merge "Thinner clock font" into ics-factoryrom
...
* commit '22aa7805dd0d9bf1c31b5cff526fda793477d8a7':
Thinner clock font
2011-09-21 18:56:50 -07:00
John Wang
6f01e62c40
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
b156ea7fc6
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
a229a38557
Merge "Fix bug 5300621 - Share menu disappears in gallery"
2011-09-21 18:26:13 -07:00