Dianne Hackborn
c3f07924a5
Small fixes and cleanup of resource config handling.
...
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
2011-05-27 12:09:11 -07:00
James Dong
21aff54036
am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
...
* commit '95f397adb13aa69b15b53bb089078d4dbdb269f1':
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
2011-05-27 11:29:46 -07:00
James Dong
a3eba24fdf
Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
2011-05-27 11:26:24 -07:00
Tadashi G. Takaoka
379e889afa
am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
...
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:48:52 -07:00
Tadashi G. Takaoka
0f4dfb3dd8
Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
2011-05-27 10:47:12 -07:00
Scott Main
7f4f0e6bdf
am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
...
* commit 'f128d5d49b95971d580b07dfdbeb513a0eb3d2df':
docs: adjust what's visible for online and offline docs
2011-05-27 10:23:01 -07:00
Scott Main
536d8aba23
Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2
2011-05-27 10:17:41 -07:00
Wink Saville
2cdd998d51
Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
2011-05-27 09:03:48 -07:00
Wink Saville
f6426844fc
Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
2011-05-26 18:19:08 -07:00
Wink Saville
2fe14ec0a9
Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
2011-05-26 18:18:52 -07:00
Dianne Hackborn
e9807fb75d
am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
...
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c':
Add new supports-screens attributes for declaring the compatible screens.
2011-05-26 17:09:39 -07:00
Dianne Hackborn
7c379dd6de
Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
2011-05-26 17:07:52 -07:00
Romain Guy
fd92426389
am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
...
* commit '4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e':
DO NOT MERGE Correctly implement the CLEAR xfermode.
2011-05-26 16:57:18 -07:00
Romain Guy
b3b2b965cc
Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
2011-05-26 16:55:33 -07:00
Gilles Debunne
ed04dd1f0c
am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
...
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:47:14 -07:00
Gilles Debunne
ca24675bf9
Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
2011-05-26 15:44:18 -07:00
Scott Main
ff694d9e8c
am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
...
* commit 'a22721301181fb995559d5badd9d286803a0ec86':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
2011-05-26 15:26:28 -07:00
Scott Main
2f0ababc1c
am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
...
* commit 'f5d8ceae68993e3af9905e58c8c6bdf90872880c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
2011-05-26 15:23:49 -07:00
Scott Main
0f7af9ca11
am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
...
* commit '28fb09e0b27a97e4664c9a31a3c72a067794b4c6':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
2011-05-26 15:21:34 -07:00
Adam Powell
463df4f97f
am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
...
* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
2011-05-26 13:34:45 -07:00
Kenny Root
6f2a934b7a
am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
...
* commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
Break apart queries to getInstalled* API DO NOT MERGE
2011-05-26 13:34:42 -07:00
Scott Main
4aec722792
am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
...
* commit 'c31239616cca417e71acb98813df7eda645835df':
DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
2011-05-26 13:34:40 -07:00
Dianne Hackborn
994df53cfc
am 2a108403: I am a dummy.
...
* commit '2a108403803bd30bee1c019060c208fb8c52c10c':
I am a dummy.
2011-05-26 13:34:37 -07:00
Dianne Hackborn
5e4fc48da2
am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
...
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
Rework how we decide whether to use system or status bar.
2011-05-26 13:34:33 -07:00
Eric Fischer
94145ad43d
am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '66fd9ab236b3df85a32792caec41a2cd83622e28':
Import revised translations. DO NOT MERGE
2011-05-26 13:34:29 -07:00
Adam Powell
0921b4be2b
Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
2011-05-26 13:26:33 -07:00
Kenny Root
e7bf0322d2
Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
2011-05-26 13:10:23 -07:00
Dianne Hackborn
2992337f5a
Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
2011-05-26 11:39:22 -07:00
Eric Fischer
423eb5e44c
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-26 11:36:58 -07:00
Wink Saville
8f59d0771a
Merge "Remove or disable some verbose debugging." into honeycomb-LTE
2011-05-26 10:55:46 -07:00
Dianne Hackborn
86374d16ce
am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
Spiffy new compatibility mode UI.
2011-05-26 10:00:00 -07:00
Dianne Hackborn
0e7b61f1c3
Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
2011-05-25 21:18:36 -07:00
Jeff Brown
de51c0988e
am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit 'fa574c0e0ce7f84eea34e96dededea35329dbd18':
Touch pad UX improvements.
2011-05-25 19:16:39 -07:00
Jeff Brown
ab184a4855
Merge "Touch pad UX improvements." into honeycomb-mr2
2011-05-25 19:15:24 -07:00
Jeff Brown
657467eccd
am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-25 18:58:22 -07:00
Jeff Brown
8808af5c05
Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 18:55:52 -07:00
Adam Powell
cf9055682e
am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit '5a328f0f7cf88a2b917db15aec9f9d1714db3e06':
Updated popup dialog 9 patches (light)
2011-05-25 18:12:40 -07:00
Adam Powell
d97a0b6d77
Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
2011-05-25 18:10:22 -07:00
Joe Onorato
a343131719
am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
Move status bar icons to sw600.
2011-05-25 17:39:04 -07:00
Joe Onorato
e7346081dd
Merge "Move status bar icons to sw600." into honeycomb-mr2
2011-05-25 17:36:54 -07:00
Jeff Hamilton
a9a3305673
am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '14019abb40785064ebef5d14e82586a910d33181':
Swap Mifare for MIFARE.
2011-05-25 15:41:51 -07:00
Jeff Hamilton
0d389cc6ab
Merge "Swap Mifare for MIFARE." into honeycomb-mr2
2011-05-25 15:38:56 -07:00
Joe Onorato
7f3c73a330
am c112118a: Merge "move resources" into honeycomb-mr2
...
* commit 'c112118a9091aa69ea70fea7c23f1e078ee87908':
move resources
2011-05-25 15:23:26 -07:00
Joe Onorato
ddc3f51233
Merge "move resources" into honeycomb-mr2
2011-05-25 15:18:56 -07:00
James Dong
2d93c9cbd2
am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:54:19 -07:00
James Dong
f050cd0782
Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
2011-05-25 14:51:52 -07:00
Jeff Brown
7709cf35b7
am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit 'b416e241db85b678cdfcdee1c74a7f356a5554ef':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-25 14:45:51 -07:00
Jeff Brown
b428eb166c
am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '325bd07b311f8ba68079000e9fe8afbcc076d7b6':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-25 14:43:37 -07:00
Jeff Brown
01fdb1bb41
am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '86ea1f5f521981d075aef56f11693e4f3bc32fdb':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-25 14:43:34 -07:00
Jeff Brown
12e858f392
am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit 'a6dbfdd3a858aac52cc87f80f91e8eef7d613605':
Add a sprite controller. (DO NOT MERGE)
2011-05-25 14:43:26 -07:00