Commit Graph

4801 Commits

Author SHA1 Message Date
c031981f23 Merge change I36ad03e1 into eclair
* changes:
  Delegate exclude mimetypes to FasttrackBadgeWidget
2009-09-28 19:03:04 -04:00
ccc624ca9a am ebd45e5c: Merge change I55edce63 into eclair
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp

* commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 15:18:51 -07:00
ebd45e5ca9 Merge change I55edce63 into eclair
* changes:
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 18:11:28 -04:00
e7d266957d Modify the "active chats" uri to not overlap with other uris. 2009-09-28 15:10:57 -07:00
36ad03e1b7 Delegate exclude mimetypes to FasttrackBadgeWidget
Internal Bug: 2138745
2009-09-28 14:58:49 -07:00
1492b96eb1 am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp

* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
  Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-28 14:41:46 -07:00
fe81d386a8 Remove obsolete links; start at a method to turn on fading scrollbars 2009-09-28 14:34:14 -07:00
ba0167861d am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp

* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
  Fix possible NPE in AbsListView.positionSelector().
2009-09-28 13:55:30 -07:00
b4c547a56c Fix possible NPE in AbsListView.positionSelector().
ListView was being reckless and calling the method with a null object in some
situations.

Change-Id: Ibb595a1ff6f916c699e4af55450966dd7fd8c156
2009-09-28 13:45:00 -07:00
6af0d50a8e Fix issue #2149145: Safe Mode does not work on Sholes device
The APIs for checking whether keys are held down now also look
at virtual keys.

However it turns out there is less than a second between the time we
start the input thread and check for safe mode, so there is not enough
time to actually open all of the devices and get the data from them
about the finger being down to determine if a virtual key is down.

So now you can also hold DPAD center, trackball center, or s to
enter safe mode.  Also give some vibrator feedback.

Change-Id: I55edce63bc0c375813bd3751766b8070beeb0153
2009-09-28 13:40:45 -07:00
3083a3c11a am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp

* commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-28 13:19:15 -07:00
26787ada59 Fix artifact in tab drawing.
The tab nine-patch assets were 2 pixes too tall. I trimmed them down.

Change-Id: Ie6a95736578c42997136eb9036b0f1d23cf2b6d7
2009-09-28 13:13:46 -07:00
aef439e6f8 Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
2009-09-28 13:06:22 -07:00
575d73a15b am 2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp

* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
  Pass limit=50 to all suggestion sources.
2009-09-28 12:54:37 -07:00
2dfa6edcd0 Merge change Ida50e915 into eclair
* changes:
  Pass limit=50 to all suggestion sources.
2009-09-28 15:47:56 -04:00
3fc7c67de1 Pass limit=50 to all suggestion sources.
Should mitigate http://b/issue?id=2149158
"Bad suggestions behavior within contacts app
search for 10k contact db"

Change-Id: Ida50e9157c3ce46fc7892ef09a67da9f4008e665
2009-09-28 20:32:13 +01:00
385a39d322 am 9d686c93: Merge change 27474 into eclair
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp

* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:49:43 -07:00
1ca9b13bf4 am 3ecd58c6: Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build
2009-09-28 11:49:36 -07:00
93d0b335a6 am 14f65ff9: Merge change 27243 into eclair
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp

* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:49:29 -07:00
9d686c9384 Merge change 27474 into eclair
* changes:
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 14:46:43 -04:00
14f65ff945 Merge change 27243 into eclair
* changes:
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 14:44:42 -04:00
3ecd58c650 Fix build 2009-09-28 11:44:36 -07:00
5b6b41241d Don't crash search when getKeyDispatcherState() is null
Fixes http://b/editIssue?id=2150672

Change-Id: I6fb87c1a59b4b3a945822932047a66c4116e6391
2009-09-28 19:37:29 +01:00
e086e1d177 am fedb3269: Merge change 27349 into eclair
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp

* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
75ce6b1038 am 96e42b3a: Merge change 27462 into eclair
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp

* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
fedb32696a Merge change 27349 into eclair
* changes:
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
96e42b3a54 Merge change 27462 into eclair
* changes:
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
a8c0edb8fb Fix 2143297: Fix transition from password -> visible password 2009-09-28 11:08:57 -07:00
91d5384470 am f116bf88: Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp

* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
  Fading scrollbars return. But you have to opt in.
2009-09-28 11:07:14 -07:00
1acdcc1a50 Add an API to request a system activity to turn on Bluetooth.
Change-Id: I2fca33ad27017ea4e2ecba37854b749682d07672
2009-09-28 11:04:00 -07:00
f116bf8884 Fading scrollbars return. But you have to opt in. 2009-09-28 10:47:04 -07:00
c2ae286513 am 5d062bc3: Merge change 27426 into eclair
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp

* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
  Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:42:13 -07:00
5d062bc3de Merge change 27426 into eclair
* changes:
  Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
2009-09-28 13:33:01 -04:00
963cd288a5 am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp

* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
  Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:15:00 -07:00
9e57be227d am fee73ee2: Merge change 27411 into eclair
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp

* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
  Cache inflated view to avoid inflation of layouts in preferences
2009-09-28 10:14:53 -07:00
b71e554d7e Add drop shadow to contact name in ContactHeaderWidget
Change-Id: Ieb6555bfca014b98567d1a981eaeb04e887e4dff
2009-09-28 10:10:33 -07:00
0d03b91407 Before we send VIEW_SIZE_CHANGED after first layout,
we should remove VIEW_SIZE_CHANGED in the queue if
there is any as we are going to send the message in
the front of the queue.

Fix http://b/issue?id=2133222
2009-09-28 10:10:15 -07:00
fee73ee2d6 Merge change 27411 into eclair
* changes:
  Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 13:07:16 -04:00
8580895575 am 207308a7: WebView may get message after destroy() is called. Just return in this case.
Merge commit '207308a781621c427acccbd9983c2511a65e9137' into eclair-plus-aosp

* commit '207308a781621c427acccbd9983c2511a65e9137':
  WebView may get message after destroy() is called.
2009-09-28 09:49:53 -07:00
cdb31ee2dd am 3fd2a81e: Merge change 27410 into eclair
Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp

* commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c':
  Add extension->mime type mappings
2009-09-28 09:49:46 -07:00
207308a781 WebView may get message after destroy() is called.
Just return in this case.

Fix http://b/issue?id=2143668
2009-09-28 09:41:33 -07:00
6585fe004e Add extension->mime type mappings
* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"

Note:  We already had a definition for .pot to text/plain.  Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.

Addresses bug # 2097457

Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
2009-09-28 09:23:53 -07:00
12482deafb am b19774d5: Updated status bar graphics (drop date 9/25/09).
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp

* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
  Updated status bar graphics (drop date 9/25/09).
2009-09-28 07:46:20 -07:00
b19774d520 Updated status bar graphics (drop date 9/25/09). 2009-09-28 10:38:38 -04:00
7885381f9b Handle the case where GoogleLocationSettingObserver::onChange
is called after GoogleLocationSettingObserver::doNotObserve().

Fixes http://b/issue?id=2147888
2009-09-28 12:42:02 +01:00
01dbc2ed55 Cache inflated view to avoid inflation of layouts in preferences
If layout id is specified for a Preference object, convertView is set to null
in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen.
Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 00:46:05 -07:00
46ed741331 am a60479d2: Fixing broken javadoc.
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp

* commit 'a60479d2ea7857455ebad6c56e357d00b0492364':
  Fixing broken javadoc.
2009-09-27 20:23:49 -07:00
a60479d2ea Fixing broken javadoc.
Was linking to a hidden interface.

Change-Id: Iff48cb97ed4078b2b91bade9a47d7afc5d7891bf
2009-09-27 20:16:37 -07:00
8e8ee1fd72 am 879664e3: Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp

* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
  Adding columns to support attribution of status updates.  Also renaming some columns to better describe their purpose.
2009-09-27 19:55:51 -07:00
879664e3e2 Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Change-Id: If6d7812f38a3cfd662a5ae2387c72c4761fdf9fa
2009-09-27 19:47:48 -07:00