11932 Commits

Author SHA1 Message Date
Erik
277465fb5b am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread
Merge commit '57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp

* commit '57bd0615fa48124c4607fbb1ba09a7c7160be146':
  b/3054044 Make allDay event times format in utc
2010-10-01 11:10:59 -07:00
Erik
57bd0615fa Merge "b/3054044 Make allDay event times format in utc" into gingerbread 2010-10-01 11:08:13 -07:00
Erik
d762a347fb b/3054044 Make allDay event times format in utc
AllDay events could get formatted with the local time zone
instead of utc. This makes it so that using the utc flag in the
wrapper for formatting correctly passes in UTC as the time zone.

Change-Id: I65090ef939ce64c1a942c7683cf76a927c02cb53
2010-10-01 11:01:01 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
0a69f59760 Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Kenny Root
6ce5f60c79 am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
2010-09-30 17:30:22 -07:00
Kenny Root
38cf8867a8 Remove OBBs from state list when volume unmounted
Don't keep tracking OBBs when the volume they're located on goes away.
Remove them from our state tracking maps and then send a notification to
any listener that is still around.

Add a dump handler to MountService so the state of the mount lists
can be inspected.

Change the API to just make a callback directly to the change listener
when mount is called when it's already mounted or unmount called when
it's already unmounted.

Change-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc
2010-09-30 17:24:34 -07:00
Steve Howard
efb8b42789 am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp

* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
  Avoid NPE when viewing failed legacy download with no local path
2010-09-30 17:22:35 -07:00
Jake Hamby
738aadd70f resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
2010-09-30 16:29:13 -07:00
Steve Howard
4ba2817c86 Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread 2010-09-30 16:22:58 -07:00
Eric Fischer
cfba8c0337 am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp

* commit '194f524456ebecbe13180146160a9b177cfb6be1':
  Import revised translations.  DO NOT MERGE
2010-09-30 15:54:26 -07:00
Jake Hamby
0a972acf85 Merge "Typo fixes in comments and minor code cleanups." into gingerbread 2010-09-30 15:47:34 -07:00
Eric Fischer
194f524456 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:44:54 -07:00
Jake Hamby
f51eadaf1f Typo fixes in comments and minor code cleanups.
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
    BluetoothDevice.convertPinToBytes()

Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
2010-09-30 15:43:34 -07:00
Kenny Root
aff30c9b0d am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
2010-09-30 14:30:14 -07:00
Kenny Root
99f8c5ee62 Merge "Fix location of gdbserver upon installation" into gingerbread 2010-09-30 14:27:15 -07:00
Kenny Root
e6da118ebf Fix location of gdbserver upon installation
Change-Id: Ie97f10456e5639e008abf4792a01b966b97721e7
2010-09-30 14:13:59 -07:00
Paul Westbrook
5dcaf7b0b9 am fcf1948a: Moved Rfc822 validator test
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp

* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
  Moved Rfc822 validator test
2010-09-30 11:45:05 -07:00
Steve Howard
538c3fa35f am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Paul Westbrook
fcf1948aeb Moved Rfc822 validator test
Moved rfc822 validator test to framework/ex, as this is where
the code lives

Change-Id: Ia12e67364df9c8f9351dea423d769454a5d4e58d
2010-09-30 11:32:42 -07:00
Steve Howard
99047d7b65 Avoid NPE when viewing failed legacy download with no local path
Change-Id: I3e9d349959543f42afed67de9f6d299c268ab7ac
2010-09-30 11:14:09 -07:00
Steve Howard
cdcc0a65fa Merge "Have download manager give more details when downloads are paused" into gingerbread 2010-09-30 11:11:16 -07:00
Wu-cheng Li
6bbc2f1562 am 2fb818ca: Fix the javadoc of Parameters.setRotation.
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp

* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
  Fix the javadoc of Parameters.setRotation.
2010-09-30 11:07:23 -07:00
Wu-cheng Li
2fb818ca7d Fix the javadoc of Parameters.setRotation.
setRotation needs to consider the orientation of cameras.
Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
2010-09-30 10:49:43 -07:00
Adam Powell
6e9a021e96 am bc87ada1: Merge "Fix text anchors" into gingerbread
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp

* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
  Fix text anchors
2010-09-30 10:10:34 -07:00
Jeff Brown
76d55a3447 am 5068ad8d: Revert orientation change.
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp

* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
  Revert orientation change.
2010-09-30 10:10:20 -07:00
Jeff Brown
b8182a382d am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp

* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
  PointerLocationView: Display orientation correctly.
2010-09-30 10:10:09 -07:00
Gilles Debunne
8064dd2265 am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp

* commit '71e2486209856d33d027389be2bd4924a03c4f86':
  New assets for status bar data_edge and overscroll
2010-09-30 10:08:38 -07:00
Adam Powell
bc87ada10d Merge "Fix text anchors" into gingerbread 2010-09-29 21:05:12 -07:00
Adam Powell
ba0a2c383f Fix text anchors
Change-Id: Iddd5434a1dbeb1adc2143db73ed27df6b575319e
2010-09-29 21:02:19 -07:00
Jeff Brown
5068ad8d23 Revert orientation change.
Change-Id: I1a6d13be118533171b9a75025dcf7985dd7e12b5
2010-09-29 20:14:56 -07:00
Jeff Brown
93e3296f94 Merge "PointerLocationView: Display orientation correctly." into gingerbread 2010-09-29 19:08:02 -07:00
Jeff Brown
707a57aa26 PointerLocationView: Display orientation correctly.
Canvas rotations are counterclockwise, orientation is clockwise,
so we need to mind the sign of the rotation.

Change-Id: I2a8b60599bd26e9dc3ced2e13942f846461333df
2010-09-29 18:41:11 -07:00
Steve Howard
3e8c1d3a46 Have download manager give more details when downloads are paused
This change introduces more detailed reporting of why downloads are paused in
the download manager.

First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED.  I've eliminated some dead code there as well to ease the
change.

Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED.  It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.

Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
2010-09-29 17:34:40 -07:00
Gilles Debunne
03b58063de New assets for status bar data_edge and overscroll
Change-Id: I32b8e036fc54a912719df660db3063045d8d7c93
2010-09-29 17:02:50 -07:00
Eric Fischer
2c3eba4c08 Import revised translations. DO NOT MERGE
Change-Id: Iaa642982ed369b45f0923f919167ccb2e27b72c4
2010-09-29 14:29:00 -07:00
Doug Zongker
ab9f508292 am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp

* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
  don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f Merge "don't delete /cache/recovery/last_log on boot" into gingerbread 2010-09-29 13:41:00 -07:00
Jaikumar Ganesh
c10207b6bf am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp

* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
  Update local cache before sending intent.
2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
a5c742bfd0 Merge "Update local cache before sending intent." into gingerbread 2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3 don't delete /cache/recovery/last_log on boot
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
2010-09-29 13:22:49 -07:00
Eric Fischer
97708b19c5 am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp

* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
  Split strings with SD card references into variations.
2010-09-29 12:17:28 -07:00
Eric Fischer
d77782ed63 Split strings with SD card references into variations.
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
2010-09-29 12:09:04 -07:00
Roy West
b4a28f2426 am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
2010-09-29 10:40:06 -07:00
Roy West
d146c233c5 Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149 Update local cache before sending intent.
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
2010-09-29 10:31:02 -07:00
Roy West
7d3d88eec0 Partial fix to bug 2992589: Edit dev admin strings.
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
2010-09-29 10:28:56 -07:00
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00