Commit Graph

5980 Commits

Author SHA1 Message Date
Android (Google) Code Review
93a3f13478 Merge change I42a80783 into eclair
* changes:
  Remove deprecated VpnType.getDescription().
2009-09-30 06:45:17 -04:00
Hung-ying Tyan
baf911d720 Remove deprecated VpnType.getDescription(). 2009-09-30 18:39:48 +08:00
Leon Clarke
f2e9c3cf2a am ccf6947e: Merge change Ib89f80df into eclair
Merge commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp

* commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
  Re-instate the link coloring on startup, but going via the browser
2009-09-30 03:11:50 -07:00
Jim Miller
c78014b4a5 am badfac38: Merge change I85d63002 into eclair
Merge commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c' into eclair-plus-aosp

* commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-09-30 03:11:42 -07:00
Dave Sparks
8a95a45fd9 Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215. 2009-09-30 03:09:03 -07:00
Android (Google) Code Review
78394204f3 Merge change Ib89f80df into eclair
* changes:
  Re-instate the link coloring on startup, but going via the browser to read the bookmark history, and restricting it to 100 results.
2009-09-30 06:08:08 -04:00
Android (Google) Code Review
560a678fb6 Merge change I85d63002 into eclair
* changes:
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-09-30 06:07:00 -04:00
Hung-ying Tyan
7ad0014163 am f2bd9017: make vpn type strings i18n ready.
Merge commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e' into eclair-plus-aosp

* commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e':
  make vpn type strings i18n ready.
2009-09-30 02:42:14 -07:00
Hung-ying Tyan
926c4b2527 make vpn type strings i18n ready. 2009-09-30 17:07:10 +08:00
Mike Cleron
9be78abc92 am 4ca8c837: Merge change Ia4087911 into eclair
Merge commit '4ca8c837d3aca781e0ba641ed4353827bfd05805' into eclair-plus-aosp

* commit '4ca8c837d3aca781e0ba641ed4353827bfd05805':
  Newer icons
2009-09-30 01:36:11 -07:00
Android (Google) Code Review
7cbc8668df Merge change Ia4087911 into eclair
* changes:
  Newer icons
2009-09-30 04:26:06 -04:00
Ray Chen
21a8afd915 am 3ba35126: update current.xml for cancelThumbnailRequest api.
Merge commit '3ba351267a3815a3c9a08e2ac7f62a39f83d7776' into eclair-plus-aosp

* commit '3ba351267a3815a3c9a08e2ac7f62a39f83d7776':
  update current.xml for cancelThumbnailRequest api.
2009-09-30 00:16:53 -07:00
Ray Chen
212c57f3a5 am 49e750a3: Merge change I7495977a into eclair
Merge commit '49e750a3586cdb09aa1a374442af48982b225050' into eclair-plus-aosp

* commit '49e750a3586cdb09aa1a374442af48982b225050':
  Add cancelThumbnailRequest to thumbnail API.
2009-09-30 00:07:08 -07:00
Android (Google) Code Review
9b4596a60b Merge change I7495977a into eclair
* changes:
  Add cancelThumbnailRequest to thumbnail API.
2009-09-30 02:59:56 -04:00
Jianhong Jiang
a0b99fcc9f am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp

* commit '37b0f279a6a237ae366c4861cde3f774f5ab811c':
  Remove audio latency fudge factor 96 msec.
2009-09-29 23:23:08 -07:00
Android (Google) Code Review
659ec973a3 Merge change I999f1aeb into eclair
* changes:
  Remove audio latency fudge factor 96 msec.
2009-09-30 02:18:15 -04:00
Nicolas Catania
7dc24d6007 am fd974f20: Merge change Ifb2ab8f8 into eclair
Merge commit 'fd974f208c5f1e7e6682d772d2cebf4501cd5aed' into eclair-plus-aosp

* commit 'fd974f208c5f1e7e6682d772d2cebf4501cd5aed':
  Reverting the background colors back to cupcake's values.
2009-09-29 23:13:24 -07:00
Android (Google) Code Review
ce9cdac813 Merge change Ifb2ab8f8 into eclair
* changes:
  Reverting the background colors back to cupcake's values.
2009-09-30 02:06:53 -04:00
Costin Manolache
8a685ff084 am 3348f14b: Remove GAIA string
Merge commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp

* commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
  Remove GAIA string
2009-09-29 22:58:53 -07:00
Mathias Agopian
7e4a587f60 introduce the notion of the requested size in the Layer state 2009-09-29 22:44:28 -07:00
Mike Cleron
9a7f88e780 am b4ee8349: Merge change I290947bb into eclair
Merge commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a' into eclair-plus-aosp

* commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a':
  Git sucks
2009-09-29 22:33:22 -07:00
Mathias Agopian
ba6be54876 remove unused code 2009-09-29 22:32:36 -07:00
Android (Google) Code Review
f376d0957d Merge change I290947bb into eclair
* changes:
  Git sucks
2009-09-30 01:26:59 -04:00
Yu Shan Emily Lau
1f48b34003 am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp

* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
  Fixed the long recorder time and reduce the number of loops.
2009-09-29 22:13:57 -07:00
Debajit Ghosh
f386d2d702 am 2a35c8d7: Merge change I96cb8d0b into eclair
Merge commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp

* commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
  fix account permission strings.  this permission is used to protect more than just Google accounts.
2009-09-29 22:13:49 -07:00
Android (Google) Code Review
a8d87b0a96 Merge change I55a6ac8c into eclair
* changes:
  Fixed the long recorder time and reduce the number of loops.
2009-09-30 01:10:54 -04:00
Android (Google) Code Review
bd64edbcd9 Merge change I96cb8d0b into eclair
* changes:
  fix account permission strings.  this permission is used to protect more than just Google accounts.
2009-09-30 01:06:07 -04:00
Dan Egnor
01b0bac972 am b1b289a0: Merge change Id6688603 into eclair
Merge commit 'b1b289a01d20a3a2e08775d31994f0abca996a63' into eclair-plus-aosp

* commit 'b1b289a01d20a3a2e08775d31994f0abca996a63':
  Better event log tracking for initializeDevice() requests --
2009-09-29 20:48:12 -07:00
Android (Google) Code Review
5cbd47da5e Merge change Id6688603 into eclair
* changes:
  Better event log tracking for initializeDevice() requests -- on success, record "backup_initialize" event; on failure, record "backup_transport_failure" event (and add tags to "backup_transport_failure" events that aren't associated with a particular package -- namely "(initialize)" and "(finish)").
2009-09-29 23:39:47 -04:00
Mike LeBeau
c17595bcc9 am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide.
Merge commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp

* commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
  Unhide APIs for enabling geolocation in web views. I've confirmed
2009-09-29 19:56:13 -07:00
Jim Miller
a7964c9686 am a4c96aa2: Merge change I88bb16e6 into eclair
Merge commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp

* commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-09-29 18:25:53 -07:00
Xavier Ducrohet
7bf4932771 am dd49055a: am ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit 'dd49055a9dc4c0e66671a80bb51cac946b431029' into eclair-plus-aosp

* commit 'dd49055a9dc4c0e66671a80bb51cac946b431029':
  Update 4.xml with the native status change of breakText/measureText
2009-09-29 18:23:02 -07:00
Android (Google) Code Review
d19cadd9a9 Merge change I88bb16e6 into eclair
* changes:
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-09-29 21:20:13 -04:00
Xavier Ducrohet
03505d9b42 am ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99' into eclair

* commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99':
  Update 4.xml with the native status change of breakText/measureText
2009-09-29 18:15:46 -07:00
Dianne Hackborn
89d6f16f8a am 989384b2: am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit '989384b20af6e76ded9ddbac77d9d7db37f3326f' into eclair-plus-aosp

* commit '989384b20af6e76ded9ddbac77d9d7db37f3326f':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
2009-09-29 18:11:49 -07:00
Dianne Hackborn
c04b842152 am e5faf231: am d135b093: (-s ours) Fix broken build. (do not merge)
Merge commit 'e5faf231e0cca9c786492b36e4abcc648c1aec8d' into eclair-plus-aosp

* commit 'e5faf231e0cca9c786492b36e4abcc648c1aec8d':
  Fix broken build. (do not merge)
2009-09-29 18:11:41 -07:00
Xavier Ducrohet
da562a8d44 am c9c834f9: am 08905850: (-s ours) Merge change I499f8819 into donut
Merge commit 'c9c834f9f35a54ee110bf07182ee03eabb2e9bad' into eclair-plus-aosp

* commit 'c9c834f9f35a54ee110bf07182ee03eabb2e9bad':
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-29 18:11:34 -07:00
Xavier Ducrohet
7c1dc6d7bc am 3e211b56: am f05f92a2: (-s ours) Merge change Id16e0e13 into donut
Merge commit '3e211b563c7a52185b748d0f38dda3a3e76cf856' into eclair-plus-aosp

* commit '3e211b563c7a52185b748d0f38dda3a3e76cf856':
  Add density value to density enum.
2009-09-29 18:11:27 -07:00
Xavier Ducrohet
93c9b926c3 am 19ea1354: am 59b30f69: (-s ours) Merge change Ia4e59dbb into donut
Merge commit '19ea135407e225777750fda5955d92f508c7968b' into eclair-plus-aosp

* commit '19ea135407e225777750fda5955d92f508c7968b':
  Add a new IResourceValue that knows about the density.
2009-09-29 18:11:19 -07:00
Dianne Hackborn
23cccc4855 am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit 'e67f0c9712890f3af19d1213ff4c4b049c401226' into eclair

* commit 'e67f0c9712890f3af19d1213ff4c4b049c401226':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
2009-09-29 18:07:59 -07:00
Dianne Hackborn
861fbc99e5 am d135b093: (-s ours) Fix broken build. (do not merge)
Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

* commit 'd135b0937875b405a20f735189040d5cb4d2546d':
  Fix broken build. (do not merge)
2009-09-29 18:07:48 -07:00
Xavier Ducrohet
d7fec557ad am 08905850: (-s ours) Merge change I499f8819 into donut
Merge commit '08905850084c501585fb0a89c346b1be6a103ca1' into eclair

* commit '08905850084c501585fb0a89c346b1be6a103ca1':
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-29 18:04:51 -07:00
Xavier Ducrohet
f68225cc61 am f05f92a2: (-s ours) Merge change Id16e0e13 into donut
Merge commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1' into eclair

* commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1':
  Add density value to density enum.
2009-09-29 18:04:41 -07:00
Xavier Ducrohet
f71d039f0d am 59b30f69: (-s ours) Merge change Ia4e59dbb into donut
Merge commit '59b30f6958f0460b59d050cde34aa863ec9b77c2' into eclair

* commit '59b30f6958f0460b59d050cde34aa863ec9b77c2':
  Add a new IResourceValue that knows about the density.
2009-09-29 18:04:32 -07:00
Wu-cheng Li
83376bf842 am 8d1ff3a4: Merge change I77153ee0 into eclair
Merge commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135' into eclair-plus-aosp

* commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135':
  Hide zoom api.
2009-09-29 17:51:18 -07:00
Android (Google) Code Review
ad5f595fe0 Merge change I77153ee0 into eclair
* changes:
  Hide zoom api.
2009-09-29 20:46:18 -04:00
Romain Guy
7ad43363f1 am 91c6bdd2: Merge change I2e069577 into eclair
Merge commit '91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp

* commit '91c6bdd20365a5c6d33986cb941aa085864d016e':
  Simplify the layout of all activities with a title and a progress bar.
2009-09-29 17:31:58 -07:00
Android (Google) Code Review
15f1da46c7 Merge change I2e069577 into eclair
* changes:
  Simplify the layout of all activities with a title and a progress bar.
2009-09-29 20:27:22 -04:00
Christopher Tate
f30b6868e0 am 072c9e74: Merge change I52e20bac into eclair
Merge commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91' into eclair-plus-aosp

* commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91':
  Add more useful-for-debug info to 'dumpsys backup'
2009-09-29 17:22:32 -07:00
Romain Guy
1b290bcff7 am 92f0370c: Merge change Id43181f2 into eclair
Merge commit '92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp

* commit '92f0370cf09ef835c72099864fe7c0e7b7389877':
  Fix disabled text color in choice dialogs.
2009-09-29 17:22:26 -07:00