Dianne Hackborn
f51ded0f8f
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
2011-06-09 16:06:07 -07:00
Dianne Hackborn
a8d7ea067c
am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
2011-06-09 16:02:02 -07:00
Dianne Hackborn
426431adcc
Enforce public resource restriction on bag parents.
...
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
2011-06-09 15:27:39 -07:00
Justin Ho
e9f203e443
am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
...
* commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
Updating default wallpaper of large devices to match xlarge
2011-06-09 12:50:10 -07:00
Justin Ho
9b0a8f9a92
am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
...
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
Updating default wallpaper of large devices to match xlarge
2011-06-09 10:22:17 -07:00
Justin Ho
3116496837
Updating default wallpaper of large devices to match xlarge
...
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
2011-06-09 09:42:22 -07:00
Dianne Hackborn
8297f66935
am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '3aabdeaceff8405406d90c329a6691552559556d':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef
am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
5ba2e872fa
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
2011-06-08 22:33:34 -07:00
Dianne Hackborn
48a7651823
Fix for not reporting correct "sw" in compat mode.
...
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
2011-06-08 22:26:33 -07:00
Dianne Hackborn
9dfd7d0a47
am 2d618e41: am e22fe933: Fix issue #4582417 : Need to add new PackageManager...
...
* commit '2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
Fix issue #4582417 : Need to add new PackageManager...
2011-06-08 21:41:55 -07:00
Dianne Hackborn
2d618e415f
am e22fe933: Fix issue #4582417 : Need to add new PackageManager...
...
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
Fix issue #4582417 : Need to add new PackageManager...
2011-06-08 21:38:33 -07:00
John Wang
4d04204824
am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
...
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
Set emergency call text visibility.
2011-06-08 20:41:41 -07:00
John Wang
08a8f3f9dc
Merge "Set emergency call text visibility." into honeycomb-LTE
2011-06-08 20:38:59 -07:00
Dianne Hackborn
e22fe9331a
Fix issue #4582417 : Need to add new PackageManager...
...
...FEATURE_ constant for FAKE_MULTITOUCH in MR2
Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
2011-06-08 20:38:41 -07:00
Dianne Hackborn
e2aa04908c
am a1396dfe: am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:06:40 -07:00
Dianne Hackborn
a1396dfe7a
am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -07:00
John Wang
5328bf0b2e
Set emergency call text visibility.
...
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.
bug:4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
2011-06-08 19:51:57 -07:00
John Wang
3948a2b420
am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
...
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
Fix layout issue on Xoom when device thinks there's a SIM.
2011-06-08 19:41:39 -07:00
John Wang
735463d1d9
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
2011-06-08 19:37:56 -07:00
Jim Miller
b0cdc2baa5
Fix layout issue on Xoom when device thinks there's a SIM.
...
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
2011-06-08 18:48:58 -07:00
Dianne Hackborn
5fd2169eab
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
Adam Powell
fb339016ff
am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
...
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
Public styles for action bar tabs
2011-06-08 17:16:16 -07:00
Adam Powell
73d54e7b54
am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
...
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
Public styles for action bar tabs
2011-06-08 16:58:35 -07:00
Adam Powell
1a4678b93f
Public styles for action bar tabs
...
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
2011-06-08 15:13:50 -07:00
Adam Powell
4e1504a66b
am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
...
* commit '7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
2011-06-07 16:37:35 -07:00
Adam Powell
7ed8ff18ce
am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
...
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
2011-06-07 16:22:32 -07:00
Adam Powell
982cb98393
Fix bug 4533120 - rough handling of invalid event streams in
...
ScaleGestureDetector
Make ScaleGestureDetector a bit more tolerant of bogus event streams.
Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
2011-06-07 16:13:51 -07:00
Romain Guy
34e9f249a9
am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
...
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
Disable plugins if setPluginsEnabled(false) called.
2011-06-07 15:09:02 -07:00
Jake Hamby
7d259626d0
resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp
...
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
2011-06-07 15:01:50 -07:00
Martijn Coenen
4c5f2a9dd2
am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
...
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
Prevent allocation overflows by corrupt NDEF records.
2011-06-07 13:23:11 -07:00
John Wang
1f8665895f
am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
...
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
Add SIM PUK unlockscreen.
2011-06-07 13:16:09 -07:00
Robert Greenwalt
e139167c91
am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
2011-06-07 13:12:29 -07:00
John Wang
71030e5365
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
2011-06-07 12:56:49 -07:00
Robert Greenwalt
5df69fad6e
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Robert Greenwalt
8de47a2f25
Merge "Reveal some network constants." into honeycomb-mr2
2011-06-07 12:00:37 -07:00
Adam Powell
a7d01a7519
am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
...
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:36:32 -07:00
Adam Powell
212d15c746
am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
...
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:32:23 -07:00
John Wang
0f7b3f8ba5
Add SIM PUK unlockscreen.
...
Puk unlockscreen is implemented as SimPukUnlockScreen.
Added config_enable_puk_unlock_screen to control the display of puk unlock screen.
Using config_voice_capable to control the display of emergency call button.
bug:4384956
Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
2011-06-07 10:12:38 -07:00
Adam Powell
a476813dcc
Make Theme.Holo.Light.NoActionBar and
...
Theme.Holo.Light.NoActionBar.Fullscreen public.
Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
2011-06-07 10:11:59 -07:00
Jeff Brown
8b2c00144a
am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
...
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug: 4124987
2011-06-06 20:34:38 -07:00
Jeff Brown
b353614572
am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
...
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug: 4124987
2011-06-06 20:32:25 -07:00
Jeff Brown
c3709f2509
am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
...
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
Improve browser scrolling when using the mouse wheel.
2011-06-06 20:32:02 -07:00
Jeff Brown
277bfd7cdd
am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
...
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
2011-06-06 20:29:08 -07:00
Jeff Brown
bb3fcba0ca
Touch pad improvements.
...
Bug: 4124987
Only show one spot per touch point instead of one spot per
finger for multitouch gestures.
Tweaked the pointer acceleration curves.
Dissociated the hover/tap timeouts from the "tap" timeout
since they mean very different things.
Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
2011-06-06 19:23:05 -07:00
Jeff Brown
7f5b99676f
Improve browser scrolling when using the mouse wheel.
...
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount. This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.
The fix is to not animate scrolls when using the mouse wheel.
Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
2011-06-06 18:59:41 -07:00
Romain Guy
fbef58faad
am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
...
* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
Disable plugins if setPluginsEnabled(false) called.
2011-06-06 17:54:12 -07:00
Jake Hamby
0cb17a52ee
resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp
...
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
2011-06-06 15:33:37 -07:00
Nick Pelly
92279c0fa1
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-06-06 11:52:21 -07:00
TK MUN
51704fc9c2
am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
2011-06-06 11:51:22 -07:00