Shih-wei Liao
7eb295d2c2
am a8e09520: am 96100195: Fix the build.
...
* commit 'a8e09520010ccc32b303c3028e37f34942e1e48c':
Fix the build.
2011-01-13 02:25:24 -08:00
Shih-wei Liao
a8e0952001
am 96100195: Fix the build.
...
* commit '96100195f06d9be287f2577a41f498917b34f7ef':
Fix the build.
2011-01-13 02:23:21 -08:00
Shih-wei Liao
96100195f0
Fix the build.
...
Change-Id: I36b523d877c5beadf0fce21b9f7534f0ffc23959
2011-01-13 02:20:51 -08:00
Shih-wei Liao
e5455b737f
am 5dfe6222: am 078717be: Merge "Disable on-device linking" into honeycomb
...
* commit '5dfe6222d97d2403a892188eddf5560971d5270d':
Disable on-device linking
2011-01-13 02:09:57 -08:00
Shih-wei Liao
b80784f772
am 7e5dc299: am c758f1c6: Merge "Fix the build." into honeycomb
...
* commit '7e5dc299f303d4cd3a2b93e56e751b5aa3490ea7':
Fix the build.
2011-01-13 02:09:53 -08:00
Shih-wei Liao
c2cfab1dba
am faf88e2d: am f6dd9c53: Merge "On-device linking." into honeycomb
...
* commit 'faf88e2d9d7af6bcc906e38a03da58df095d8419':
On-device linking.
2011-01-13 02:09:48 -08:00
Shih-wei Liao
5dfe6222d9
am 078717be: Merge "Disable on-device linking" into honeycomb
...
* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
Disable on-device linking
2011-01-13 02:07:53 -08:00
Shih-wei Liao
7e5dc299f3
am c758f1c6: Merge "Fix the build." into honeycomb
...
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
Fix the build.
2011-01-13 02:07:48 -08:00
Shih-wei Liao
6806ef69bd
am 9b024b69: am 3ae5017b: Merge "convert2uchar3." into honeycomb
...
* commit '9b024b693e089aa28acfe637eb4513425efa5766':
convert2uchar3.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
faf88e2d9d
am f6dd9c53: Merge "On-device linking." into honeycomb
...
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
On-device linking.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
078717be07
Merge "Disable on-device linking" into honeycomb
2011-01-13 02:06:17 -08:00
Shih-wei Liao
0394d2495a
Disable on-device linking
...
Change-Id: I7c416c7c9714fae0722e61c4f0368fbdb7d808b3
2011-01-13 02:05:34 -08:00
Shih-wei Liao
9b024b693e
am 3ae5017b: Merge "convert2uchar3." into honeycomb
...
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
convert2uchar3.
2011-01-13 02:05:32 -08:00
Shih-wei Liao
c758f1c6a3
Merge "Fix the build." into honeycomb
2011-01-13 02:04:10 -08:00
Shih-wei Liao
f6dd9c539c
Merge "On-device linking." into honeycomb
2011-01-13 02:04:00 -08:00
Shih-wei Liao
3ae5017b1b
Merge "convert2uchar3." into honeycomb
2011-01-13 02:03:51 -08:00
Shih-wei Liao
3a3dd2b37c
Fix the build.
...
Change-Id: I20ac8700bcc8ccb7905f82bbfea81d007f67a68e
2011-01-13 02:03:00 -08:00
Adam Powell
311239b101
am 1fc7c046: am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
...
* commit '1fc7c0462e0ffc4b036fb162094aa2c6c93ad078':
Fix bugs 3077517 and 3309579 - ListView bugs
2011-01-12 23:54:05 -08:00
Adam Powell
1fc7c0462e
am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
...
* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
Fix bugs 3077517 and 3309579 - ListView bugs
2011-01-12 23:52:25 -08:00
Adam Powell
2ea9aaa245
Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
2011-01-12 23:50:05 -08:00
Adam Powell
4032252c99
Fix bugs 3077517 and 3309579 - ListView bugs
...
Fix smoothScrollPositionFromTop scrolling too far on reverse scrolls
Fix an invalid touch mode when smoothScrollBy attempts to scroll off
the end of a list
2011-01-12 23:45:01 -08:00
Guang Zhu
25ee01b14a
am fdc911f2: am 37f81344: Merge "change webkit test data path" into honeycomb
...
* commit 'fdc911f237c263d7212695c23c66f8f7fb9156ff':
change webkit test data path
2011-01-12 23:33:39 -08:00
Guang Zhu
fdc911f237
am 37f81344: Merge "change webkit test data path" into honeycomb
...
* commit '37f813443dbe51277c2d849eb2b53caa137d50f7':
change webkit test data path
2011-01-12 23:32:00 -08:00
Guang Zhu
37f813443d
Merge "change webkit test data path" into honeycomb
2011-01-12 23:29:53 -08:00
Justin Ho
6628019cb2
am eff3acd7: am cd0331ab: Fixing broken dropdown asset in Honeycomb as well
...
* commit 'eff3acd77e337213219017c4b55402214843a3b1':
Fixing broken dropdown asset in Honeycomb as well
2011-01-12 23:01:15 -08:00
Justin Ho
eff3acd77e
am cd0331ab: Fixing broken dropdown asset in Honeycomb as well
...
* commit 'cd0331abd7eb1e9efff3251caa008492fe5cad35':
Fixing broken dropdown asset in Honeycomb as well
2011-01-12 22:59:33 -08:00
Guang Zhu
7171622320
change webkit test data path
...
path changed from "/sdcard/android/" to "/sdcard/webkit/". the
old path clashes with "/sdcard/Android/" and has some odd issues
under FUSE
Change-Id: I57102dca99612bdd7b4d1f196e43436cd1276281
2011-01-12 22:57:41 -08:00
Justin Ho
cd0331abd7
Fixing broken dropdown asset in Honeycomb as well
...
Change-Id: Ie5a89fbf38dbad8e768c5c7569bd2e9a872fb587
2011-01-12 22:56:55 -08:00
Justin Ho
f104982699
Fixing broken dropdown asset
...
Change-Id: Icbeae8f234a4d21251ed592f681b520c32fa502e
2011-01-12 22:52:37 -08:00
Andy Stadler
328526c975
am 199ae7dc: am 7b0f8f08: API changes to support encryption in DPM
...
* commit '199ae7dce11badac71c27b1d973e24387dd5f924':
API changes to support encryption in DPM
2011-01-12 21:18:48 -08:00
Andy Stadler
199ae7dce1
am 7b0f8f08: API changes to support encryption in DPM
...
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
2011-01-12 21:17:03 -08:00
Andy Stadler
7b0f8f08ac
API changes to support encryption in DPM
...
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
a device that does not support encryption.
NOTE: Nobody should use ACTION_START_ENCRYPTION yet. It needs a receiver
to be built in Settings (different CL).
Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
2011-01-12 21:11:32 -08:00
Jaikumar Ganesh
b96164ca09
am f683a357: (-s ours) am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit 'f683a357ee74f1bdd14ebdbac83c10d472386d71':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 20:51:16 -08:00
Eric Laurent
5ee164d204
am ba035dd0: am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit 'ba035dd049c345e2041e86e262d03940f0bb2699':
Fix issue 3302649.
2011-01-12 20:51:12 -08:00
Justin Ho
8e2d647adc
am e7ecc447: am 58ea9394: (-s ours) am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit 'e7ecc447291b5a0e617dcfd876a446a71df50410':
Updated flightmode assets
2011-01-12 20:51:08 -08:00
Jaikumar Ganesh
f683a357ee
am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit '471de1f5b3cc629739d8315ff195d6af928e7ae4':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 20:48:51 -08:00
Eric Laurent
ba035dd049
am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit '48f400c3762bd50603222cb5e7856d6aef4ebc4e':
Fix issue 3302649.
2011-01-12 20:48:44 -08:00
Justin Ho
e7ecc44729
am 58ea9394: (-s ours) am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '58ea93945b6cd7b91d2d54845275fd90ee7fb291':
Updated flightmode assets
2011-01-12 20:48:38 -08:00
Chet Haase
d7e517c721
am 8d38f9d2: am 7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
...
* commit '8d38f9d2d87060ae4875049c0627f198bafa02ba':
Fix null crash when fragments go away during animations
2011-01-12 20:38:44 -08:00
Chet Haase
8d38f9d2d8
am 7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
...
* commit '7cc5e1d5488c9e0a3f898a62b626ffb3ae074440':
Fix null crash when fragments go away during animations
2011-01-12 20:36:59 -08:00
Chet Haase
7cc5e1d548
Merge "Fix null crash when fragments go away during animations" into honeycomb
2011-01-12 20:34:32 -08:00
Christopher Tate
b7e7bc42f1
am 3186e0da: am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
...
* commit '3186e0da33256400b52024b268c9e6e048caee6c':
Turn off debugging logspam for release
2011-01-12 20:27:21 -08:00
Christopher Tate
3186e0da33
am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
...
* commit '44a94bb5a915922400944f666b218f4bb268c565':
Turn off debugging logspam for release
2011-01-12 20:25:32 -08:00
Christopher Tate
44a94bb5a9
Merge "Turn off debugging logspam for release" into honeycomb
2011-01-12 20:23:49 -08:00
Jim Miller
5aa2a2d14c
am 18c4ef5f: am 66707eee: Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
...
* commit '18c4ef5fc18e4bc7ea89380a438a97307bd1386f':
Fix 3253629: Tweaks to recent apps
2011-01-12 20:12:25 -08:00
Jim Miller
18c4ef5fc1
am 66707eee: Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
...
* commit '66707eee84ee874f60ff5d25c5d2d00769e79616':
Fix 3253629: Tweaks to recent apps
2011-01-12 20:10:28 -08:00
Jim Miller
66707eee84
Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
2011-01-12 20:07:36 -08:00
Christopher Tate
994ef9296a
Turn off debugging logspam for release
...
Fixes bug 2679101
Change-Id: I94cf1b1d0b732b2030008118eff3534f0e0608f7
2011-01-12 20:06:07 -08:00
Jim Miller
85babff4a3
Fix 3253629: Tweaks to recent apps
...
This updates the animation and fixes a few bugs with showing
and hiding recents as well as tweaks from UX in animation
timing, effects and the background protector.
Change-Id: I1c57e566408c7b732a0c902e27125951d0277322
2011-01-12 19:25:57 -08:00
Shih-wei Liao
067e7b261a
On-device linking.
...
Change-Id: I609f575f1c2b9e9c3de0d8c16eb06b66b744bcb5
2011-01-12 19:14:27 -08:00