Scott Main
9886a34e03
am 04295266: add api level 13 flag for docs
...
* commit '04295266b03f3c588b8be6b6be409d59f757b27b':
add api level 13 flag for docs
2011-06-21 10:31:09 -07:00
Daniel Sandler
d26b58be49
am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
...
* commit '444336dd5f233c59e5a222d366d2498c888664b5':
Fix crazy notification panel background.
2011-06-20 17:30:38 -07:00
Daniel Sandler
f59e969313
Merge "Fix crazy notification panel background." into honeycomb-mr2
2011-06-20 17:29:24 -07:00
Scott Main
39edd39b47
am bb64fa1e: docs: fix a couple typos
...
* commit 'bb64fa1e3dde8910397d159eaa300c4444b0073c':
docs: fix a couple typos
2011-06-20 17:28:41 -07:00
Scott Main
fd682f1250
am beeb7762: docs: fix broken link
...
* commit 'beeb776209446ea45252af5bbc1fe8a463b2001b':
docs: fix broken link
2011-06-20 17:26:48 -07:00
Robert Greenwalt
05bfbc458c
Merge "Fix tethering upstream determination." into honeycomb-LTE
2011-06-20 11:47:49 -07:00
Robert Ly
20d6fbd94c
am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
...
* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:44:59 -07:00
Robert Ly
b41a023a5c
am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
...
* commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:44:55 -07:00
Robert Ly
9fcc542657
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
2011-06-20 09:37:51 -07:00
Robert Ly
d02950e3a0
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
2011-06-20 09:37:36 -07:00
Mathias Agopian
f588d1dc95
am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
...
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:09:56 -07:00
Mathias Agopian
debc234c24
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
...
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
2011-06-16 17:22:28 -07:00
John Wang
0fcbbddfcf
am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
...
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 16:50:05 -07:00
John Wang
3c44627702
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
2011-06-16 16:47:18 -07:00
Dianne Hackborn
2f5e3d3871
am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
...
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:22:10 -07:00
Dianne Hackborn
08f1885b8e
am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
...
* commit 'abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
2011-06-16 14:49:08 -07:00
Dianne Hackborn
9240137679
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
2011-06-16 14:47:53 -07:00
Robert Greenwalt
cda357ea8e
am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
...
* commit '6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
DO NOT MERGE
2011-06-16 14:44:57 -07:00
Robert Greenwalt
865fc6c36c
Merge "DO NOT MERGE" into honeycomb-mr2
2011-06-16 14:40:25 -07:00
Xavier Ducrohet
ad322e2091
am 04ce8111: Bring in more layout lib changes from hc-mr1.
...
* commit '04ce81113107d2bfa0b8248b13145b4cf24cb943':
Bring in more layout lib changes from hc-mr1.
2011-06-16 13:39:31 -07:00
Robert Greenwalt
d6d0e0d7a7
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
2011-06-16 11:34:03 -07:00
John Wang
a94331c908
Merge "Support SIM permanently disabled state." into honeycomb-LTE
2011-06-16 11:22:53 -07:00
Mathias Agopian
866f87251f
am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
* commit '8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
2011-06-15 22:40:07 -07:00
Mathias Agopian
6fb53d2835
am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
* commit '52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
2011-06-15 22:09:39 -07:00
Mathias Agopian
1b2c2a9ea0
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
2011-06-15 20:45:32 -07:00
Mathias Agopian
63ad28fb53
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
2011-06-15 20:42:25 -07:00
Mathias Agopian
a31b4f3fb9
am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
...
* commit 'd20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
2011-06-15 20:18:24 -07:00
Mathias Agopian
c6601d3e01
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
2011-06-15 20:16:15 -07:00
Mathias Agopian
3790e7997a
revert surfaceflinger leak fix as it uncovered a crasher on xoom
...
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
2011-06-15 19:31:04 -07:00
Dianne Hackborn
7bc78b3c10
am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
...
* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
We must keep up with the Joneses.
2011-06-15 17:10:33 -07:00
Dianne Hackborn
975acd5556
Merge "We must keep up with the Joneses." into honeycomb-mr2
2011-06-15 17:08:04 -07:00
Eric Fischer
238b556401
am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '5e451faa0c22e943fb76d812f699d51fa11c5495':
Import revised translations. DO NOT MERGE
2011-06-15 16:41:44 -07:00
Eric Fischer
32066cf9de
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-06-15 16:38:43 -07:00
Justin Ho
92ecd9e25d
am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
...
* commit 'f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
2011-06-15 14:56:03 -07:00
Justin Ho
d502ddadca
Merge "Updated art for compat mode dialog." into honeycomb-mr2
2011-06-15 14:52:52 -07:00
Wink Saville
4e89c63709
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
2011-06-15 14:31:16 -07:00
Irfan Sheriff
a260990eae
am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
2011-06-15 14:04:23 -07:00
Irfan Sheriff
1e765667fb
Merge "Fix lease duration handling" into honeycomb-mr2
2011-06-15 14:00:23 -07:00
Wink Saville
30d59b323d
Merge "Clean up some debug statements." into honeycomb-LTE
2011-06-15 13:55:06 -07:00
Dianne Hackborn
895ca5888d
am ed31bbf6: Clean up some edge cases in the compat mode UI:
...
* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
2011-06-15 12:35:57 -07:00
Daniel Sandler
c60919e7a3
am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
...
* commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d':
One-time-only compatibility mode explanation dialog.
2011-06-15 06:15:11 -07:00
Daniel Sandler
96ee0cbcc8
am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
...
* commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3':
Final UI for compatibility mode.
2011-06-15 06:15:07 -07:00
Daniel Sandler
474a302d5a
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
2011-06-15 06:10:32 -07:00
Daniel Sandler
75566f4bf5
Merge "Final UI for compatibility mode." into honeycomb-mr2
2011-06-15 06:10:27 -07:00
Dianne Hackborn
80dda22726
am a9551706: Testing done, compatibility mode no longer on by default.
...
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
2011-06-14 21:47:51 -07:00
Dianne Hackborn
fcca30f52b
am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
0c108fb41d
am 4e04380d: Merge "Fix issue #4592768 : Xoom display does not resize when..." into honeycomb-mr2
...
* commit '4e04380d0a42347013808ee2058c786582ad548f':
Fix issue #4592768 : Xoom display does not resize when...
2011-06-14 19:19:25 -07:00
Dianne Hackborn
ff427a1560
Merge "Fix issue #4592768 : Xoom display does not resize when..." into honeycomb-mr2
2011-06-14 19:16:46 -07:00
Robert Ly
149c6670e7
am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
...
* commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
2011-06-14 17:47:51 -07:00
Robert Ly
6755f930c0
am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
...
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
2011-06-14 17:46:07 -07:00