Dianne Hackborn
729fc387b0
Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
2011-06-09 15:55:54 -07:00
Robert Greenwalt
f2f8aee7c3
Merge "Set locale based on SIM preferred language." into honeycomb-LTE
2011-06-09 15:48:16 -07:00
Dianne Hackborn
d4bfc93113
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
James Dong
9266ee53dc
am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
...
* commit 'e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
2011-06-09 12:03:52 -07:00
Mike Lockwood
ed158883f2
am b3174c46: UsbService: Fix JNI reference leak
...
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
UsbService: Fix JNI reference leak
2011-06-09 12:01:31 -07:00
James Dong
f98f69241f
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
2011-06-09 11:56:09 -07:00
Justin Ho
ad65602b71
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
Xavier Ducrohet
2efdc93e35
am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
...
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
2011-06-09 10:19:14 -07:00
Justin Ho
c762e30727
Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
2011-06-09 10:18:13 -07:00
Xavier Ducrohet
4734541892
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
...
* changes:
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
2011-06-09 10:12:40 -07:00
Dianne Hackborn
dbd950b87a
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
deb21d3eda
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
2011-06-08 22:33:34 -07:00
Dianne Hackborn
c7269cbfa6
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
e179704ece
Merge "Set emergency call text visibility." into honeycomb-LTE
2011-06-08 20:38:59 -07:00
Dianne Hackborn
2b6f1b12f7
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
Dianne Hackborn
ab6bf752b3
Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
2011-06-08 20:00:50 -07:00
John Wang
7f0d352506
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
2011-06-08 19:37:56 -07:00
Mathias Agopian
58d6631e4d
am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
...
* commit '645434fb4eff408698423d70904fb8fc709a5225':
Fix a leak in RefBase
2011-06-08 19:30:47 -07:00
Mathias Agopian
ee8e9af975
Merge "Fix a leak in RefBase" into honeycomb-mr2
2011-06-08 19:28:39 -07:00
Dianne Hackborn
acf87675ae
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
58ac3ee602
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
59fd67e54b
Merge "Public styles for action bar tabs" into honeycomb-mr2
2011-06-08 16:54:50 -07:00
Mathias Agopian
3b0a7a739e
Fix a leak in RefBase
...
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Id85e749ba04521199555dd701198edd097c313d4
2011-06-08 16:25:01 -07:00
Wink Saville
267850eedd
Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
2011-06-08 15:00:46 -07:00
Wink Saville
f29d2e41af
Merge "Use CSIM to get provision information" into honeycomb-LTE
2011-06-08 14:58:53 -07:00
John Wang
4a7ccb16b9
am cea03df2: Do not merge. Return null id for Non-phone device.
...
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
Do not merge. Return null id for Non-phone device.
2011-06-08 13:52:26 -07:00
Jeff Brown
4e330146a3
am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
...
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 13:52:22 -07:00
Wink Saville
48f6f541da
Merge "Fix default preferred network." into honeycomb-LTE
2011-06-08 12:56:27 -07:00
Jeff Brown
1c251f9d9a
Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
2011-06-07 16:58:06 -07:00
Adam Powell
88208e7317
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
886afd25c9
Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
2011-06-07 16:19:26 -07:00
John Wang
b7dfeedb56
Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
2011-06-07 15:49:34 -07:00
Dianne Hackborn
089fbb0fc6
am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
...
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
2011-06-07 15:47:14 -07:00
Dianne Hackborn
c16a374f3f
Merge "Remove compat mode dialog." into honeycomb-mr2
2011-06-07 15:45:14 -07:00
Dianne Hackborn
991e72babe
am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
...
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
DO NOT MERGE. Experimental compatibility mode UI.
2011-06-07 15:39:43 -07:00
Dianne Hackborn
6086cca9ff
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
2011-06-07 15:36:51 -07:00
Mathias Agopian
3d95709b08
am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
...
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
2011-06-07 14:58:02 -07:00
Mathias Agopian
36ca5e7217
fix a surface leak introduced by a failed merge (DO NOT MERGE)
...
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
2011-06-07 14:52:22 -07:00
Irfan Sheriff
fbc4a8dbbe
Merge "Clear IP configuration on lost network" into honeycomb-LTE
2011-06-07 13:40:38 -07:00
John Wang
3811395d3a
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
2011-06-07 12:56:49 -07:00
Robert Greenwalt
2e13ac10a7
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Robert Greenwalt
aa580c7936
Merge "Reveal some network constants." into honeycomb-mr2
2011-06-07 12:00:37 -07:00
Adam Powell
aa5750fd23
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
Wink Saville
1baddeb506
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
2011-06-07 10:58:09 -07:00
Robert Greenwalt
91d9684a0b
Merge "Fix NPE in the statusbar." into honeycomb-LTE
2011-06-07 10:57:20 -07:00
Jeff Brown
25065bbb27
am 5cb05eea: Merge "Fix build." into honeycomb-mr2
...
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
2011-06-06 21:08:25 -07:00
Jeff Brown
a6d2cd4f07
Merge "Fix build." into honeycomb-mr2
2011-06-06 21:06:30 -07:00
Jeff Brown
1531e594fb
am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
...
* commit '2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
Revert velocity damping. Bug: 4364920
2011-06-06 20:34:35 -07:00
Jeff Brown
3a550fa828
am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
...
* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:34:33 -07:00
Jeff Brown
0a3b747378
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