Commit Graph

8180 Commits

Author SHA1 Message Date
Romain Guy
feb4fb9682 Fix the build, really
Change-Id: Id5e00cf7eb822dabb0b2b95b541855871ff0fe07
2010-03-31 21:09:19 -07:00
Romain Guy
ec1ca4200c Fix the build
Change-Id: Ia55ab3e19e6cf81d719759eac48e00849bc0b73b
2010-03-31 19:34:08 -07:00
Romain Guy
81d56ac157 Merge "Add support for XML-defined adapters. This is preliminary work for new types of Launcher widgets." 2010-03-31 19:09:50 -07:00
Freeman Ng
943606004b Merge "Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons" 2010-03-31 16:39:54 -07:00
Romain Guy
30346c4399 Add support for XML-defined adapters.
This is preliminary work for new types of Launcher widgets.

See javadoc in android.widget.Adapters for more details.

Change-Id: I413b8d5f97673e255d84dc07ad112c333c0ce9dc
2010-03-31 16:07:35 -07:00
The Android Open Source Project
9bab8f115b am 4790259c: am 8de2cf4c: merge from open-source master 2010-03-31 14:23:19 -07:00
The Android Open Source Project
4790259c32 am 8de2cf4c: merge from open-source master
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken

* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
  Fix last character of password field being visible after rotation
  gl_code : add end of line.
2010-03-31 14:17:32 -07:00
The Android Open Source Project
8de2cf4cce merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
2010-03-31 14:01:45 -07:00
Doug Felt
9f7a4442b8 Enable nested bidi levels in a paragraph.
Changes the internal representation of direction information in the Directions object to be a visually-ordered list of start/length+direction pairs instead of a list of directionality inversion offsets.

Rewrite Layout.getOffsetToLeft/RightOf to use run information instead of width metrics.

Remove java Bidi, use native.  Switch bidi tests to test native, expect levels instead of dirs.

Add test of directionality.  Leave in switch to turn new code off and restore previous behavior for now.

Change-Id: Iea8bb46c678a18820e237c90f76007a084c83051
2010-03-31 12:08:55 -07:00
Patrick Scott
d2085c8844 am e4424326: am 09c49a8a: am 92534469: Use case insensitive matching. 2010-03-31 11:14:33 -07:00
Freeman Ng
19ea2e0d78 Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons
Change-Id: Ifc8c22c70e808629a9a889406f17a962615e2574
2010-03-31 11:10:41 -07:00
Patrick Scott
e4424326ce am 09c49a8a: am 92534469: Use case insensitive matching.
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken

* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
  Use case insensitive matching.
2010-03-31 11:04:50 -07:00
Patrick Scott
09c49a8a6c am 92534469: Use case insensitive matching.
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp

* commit '9253446922d925f6a5453b60d539beed292921a7':
  Use case insensitive matching.
2010-03-31 11:00:39 -07:00
San Mehat
6f63dd5dc8 framework: Hide StorageManager for froyo - do not merge
Change-Id: I9a871e49cc9e1accb28c7e4b76bb0796eaf26d7b
2010-03-31 10:46:42 -07:00
Patrick Scott
9253446922 Use case insensitive matching.
Use the lowercase version of the protocol.

Bug: 2560217
Change-Id: Ibfadf4ba363968df9caf22c9ab36f666ee44d1db
2010-03-31 13:36:47 -04:00
Robert Greenwalt
955728a97d am f9112090: am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 2010-03-31 09:55:27 -07:00
Robert Greenwalt
f91120905a am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.
2010-03-31 08:37:45 -07:00
Robert Greenwalt
676f70527d am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp

* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
  Fix HttpProxy.
2010-03-31 08:35:16 -07:00
Robert Greenwalt
0a08b1948f Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00
Bjorn Bringert
aaf54e467d am 3a694c04: am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract 2010-03-31 07:31:40 -07:00
Bjorn Bringert
3a694c045f am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract
Merge commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken

* commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68':
  Support for apps search in apps provider contract
2010-03-31 07:26:12 -07:00
Bjorn Bringert
86f6f536e0 am 11a7ba36: Support for apps search in apps provider contract
Merge commit '11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp

* commit '11a7ba367f39175f41300f384ec6e984bcc08d53':
  Support for apps search in apps provider contract
2010-03-31 07:21:13 -07:00
Bjorn Bringert
11a7ba367f Support for apps search in apps provider contract
Bug http://b/issue?id=2559078

Change-Id: Ic0d3ac3af2ca5f066618e279786af2df11cd0113
2010-03-31 14:32:09 +01:00
Jeff Brown
41f7cb398e am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken 2010-03-31 00:08:13 -07:00
Jeff Brown
767225d820 resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
d9ee01a95c am 07330791: Show SD unavailable icon for apps on SD when ejected.
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp

* commit '07330791116513710d879c45b2f095cd314cbfd0':
  Show SD unavailable icon for apps on SD when ejected.
2010-03-30 23:32:12 -07:00
Jeff Brown
0733079111 Show SD unavailable icon for apps on SD when ejected.
This change include a minor refactoring of PackageItemInfo and related
classes to eliminate code duplication and to avoid redundant work
searching for an ApplicationInfo instance we already have.

Bug: b/2537578
Change-Id: Id0794c3f055ea58b943028f7a84abc7dec9d0aac
2010-03-30 22:20:42 -07:00
Robert Greenwalt
f1cac90c7b Fix HttpProxy.
A key bit of code was lost in change 38/25338/5 (2009/09/17 change
of RequestQueue.java) which caused us to not pick up proxy settings.
Putting it back.

bug:2364475
Change-Id: I1e79858f64d8e793a966ef8e6f7a0d3f2a02251f
2010-03-30 19:15:32 -07:00
Fred Quintana
5025b7b646 am 6669a7b4: am 4a2f285d: am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the init 2010-03-30 18:52:31 -07:00
Fred Quintana
6669a7b4b5 am 4a2f285d: am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization
Merge commit '4a2f285deafc996435ac20162abaeb21838c1c40' into kraken

* commit '4a2f285deafc996435ac20162abaeb21838c1c40':
  - changed periodic sync scheduling to just creating pending
2010-03-30 18:42:20 -07:00
Fred Quintana
018495191f am 010fbfc9: am 344ba661: am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getC 2010-03-30 18:39:30 -07:00
Fred Quintana
4a2f285dea am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization sync extra -
Merge commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp

* commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
  - changed periodic sync scheduling to just creating pending
2010-03-30 18:38:46 -07:00
Fred Quintana
77c560f3d7 - changed periodic sync scheduling to just creating pending
and changed the "get next operation to sync" logic just look
  at pending syncs, rather than them and periodic syncs
- made syncoperation dup-detection ignore the initialization
  sync extra
- made the sync dispatcher treat initialization syncs as just
  a regular sync request and also made it explicitly set or
  clear the initialization extra based on whether the sync
  adapter was in the syncable or unknown state
- change the getNextSync logic to prioritize syncable "unknown"
  syncs above everything else (since they should be fast and
  are important)
- make it reschedule completed initialization syncs if the
  sync adapter is now marked syncable
- fix some logging in SyncStorageEngine
- change SyncStorageEngine to not reuse authority ids when one
  is removed

http://b/issue?id=2531359
http://b/issue?id=2429638

Change-Id: I79805b582da74f4f0b6193eafaff24c2371d51e8
2010-03-30 18:31:27 -07:00
Fred Quintana
010fbfc984 am 344ba661: am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync -
Merge commit '344ba661ab406759a91ecaba1378a4907971b119' into kraken

* commit '344ba661ab406759a91ecaba1378a4907971b119':
  some changes due to an API review
2010-03-30 18:29:25 -07:00
Fred Quintana
344ba661ab am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp

* commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
  some changes due to an API review
2010-03-30 18:24:15 -07:00
Fred Quintana
d5e4fdc8a4 some changes due to an API review
- make EntityIterator extend Iterator and thus not throw a
   RemoteException, instead converting it into a RuntimeException.
 - rename ActiveSyncInfo to SyncInfo
 - change getActiveSync to getCurrentSync
 - remove the accessors in SyncInfo and instead make the final
   fields publicly accessible
 - made AbstractThreadedSyncAdapter.cancelSync not take a thread

Change-Id: I99fde5585bc5f1e95f4873ffbba189074a8d6372
http://b/issue?id=2553539
http://b/issue?id=2553541
http://b/issue?id=2553550
2010-03-30 17:31:52 -07:00
Daniel Lehmann
726e838cc9 am 22d7142d: am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 17:14:34 -07:00
Daniel Lehmann
22d7142dd9 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:05:42 -07:00
Adam Powell
cdf671956c am e3d5f0f7: am 9ebc9f46: am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 2010-03-30 17:05:42 -07:00
Christopher Tate
63411e24d3 am 7738c525: am 82a8b363: am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper 2010-03-30 17:05:38 -07:00
Daniel Lehmann
1b679754b6 am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:01:45 -07:00
Daniel Lehmann
58c9a4bca0 Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 16:58:38 -07:00
Adam Powell
e3d5f0f7e9 am 9ebc9f46: am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken

* commit '9ebc9f464f45ec30003cd30854188a376c6d155f':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
2010-03-30 16:54:43 -07:00
Christopher Tate
7738c5259c am 82a8b363: am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken

* commit '82a8b3632c28d18d58a585160163fbf63d0c9746':
  API CHANGE: @hide AbsoluteFileBackupHelper
2010-03-30 16:54:39 -07:00
Adam Powell
9ebc9f464f am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp

* commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
2010-03-30 16:50:41 -07:00
Christopher Tate
82a8b3632c am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp

* commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
  API CHANGE: @hide AbsoluteFileBackupHelper
2010-03-30 16:50:36 -07:00
Adam Powell
3ac51b3d6f Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 2010-03-30 16:46:21 -07:00
Adam Powell
005c0a445e Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
AbsListView was relying on TOUCH_MODE_DOWN to signal that the item was
enabled, but onInterceptTouchEvent uses it for other purposes. Check
before dispatching the event.

Change-Id: I6babd3872cb51ebdba8e97a3b349e0cc08cd1279
2010-03-30 16:26:36 -07:00
Dianne Hackborn
d784cc4a22 am 591ad27d: am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 2010-03-30 16:15:09 -07:00
Christopher Tate
27a63583bf API CHANGE: @hide AbsoluteFileBackupHelper
We don't want to publish this, but for risk mitigation we are hiding it
rather than rewriting/expanding the FileBackupHelper to accomodate the
absolute-path use cases that the system uses internally.

Change-Id: I513c97ec54de8dd7d28b10868d447d94b82d4ec3
2010-03-30 16:05:56 -07:00