Commit Graph

1014 Commits

Author SHA1 Message Date
Mike Lockwood
ff0aff1914 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Adam Powell
5d27977f9d Action modes without action bar
Change-Id: I0367ab35e598a17980bd373b30828175f6283acc
2010-07-27 21:04:52 -07:00
Bai Tao
a58a8751b4 Add new system service CountryDetector
a. The CountryDetector detects the country the user is in
   in order of mobile network, location, sim card or locale.
   It will be used by contact and contact provider.

b. All added APIs are hidden at this stage.

Change-Id: I4ba278571ffb6ab6ded0996d4f440a18534f8ed4
2010-07-28 09:45:57 +08:00
Jean-Baptiste Queru
005cb6de07 Fix build
Change-Id: Iac31df396eaadd711088c149e4f7b616ff599a29
2010-07-27 15:38:01 -07:00
Brad Fitzpatrick
69057d0226 am f7ad0aa0: am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Merge commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1'

* commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1':
  Explicitly mention again that startCommand() runs on the main thread.
2010-07-27 15:24:50 -07:00
Brad Fitzpatrick
f7ad0aa005 am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Merge commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp

* commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
  Explicitly mention again that startCommand() runs on the main thread.
2010-07-27 15:21:30 -07:00
Brad Fitzpatrick
0166c35305 Explicitly mention again that startCommand() runs on the main thread.
This is already mentioned at the top of Service.java's javadoc, but
I'm seeing people get confused (myself included the other day) after
getting used to incoming service stub binder calls being on their own
threads and forgetting that startCommand() didn't work that way.

Change-Id: Ib79f48d9368ac0ba2d37b7e4dc98d53804bcd59e
2010-07-27 14:57:08 -07:00
Adam Powell
6e34636749 Moved context modes into view, renamed to action modes
ContextualMode renamed to ActionMode. Adds a reference to the action
bar and reduces confusion around things named "Context".

Change-Id: Ia5098b1d0799a0ece0810c34e6696eda039fb005
2010-07-26 17:28:45 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
2010-07-26 12:30:19 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer.
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
2010-07-26 12:24:57 -07:00
Ben Komalo
7cd83428f1 Ensure that creating a Loader/LoaderManager after the Activity has
started will kick off startLoading() as expected.

Change-Id: I8ec76d39665aab0dc72fb083b6b3751a45b51fce
2010-07-26 10:03:14 -07:00
Dianne Hackborn
14bfa398a4 Infrastructure to report running services to developer.
Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
2010-07-24 20:07:17 -07:00
Dianne Hackborn
dd913a50cd Add new DialogFragment class.
For all your Dialog needs.

Change-Id: I36c602ca253488d34a55c8f0be610b9752c33264
2010-07-24 11:42:05 -07:00
Steve Howard
a265083890 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:27:02 -07:00
Steve Howard
5e43c5a6e8 am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:22:58 -07:00
Steve Howard
b8e07a51c1 DL manager support for broadcasts + connectivity control
* Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control.  This includes new constants and added implementation.
* New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls.

Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
2010-07-21 19:09:35 -07:00
Adam Powell
2175f1370c Rename callback methods for contextual modes to match recent refactoring.
Change-Id: I9403f0c728143cd075827f21270b5468abc5271b
2010-07-21 17:26:46 -07:00
Adam Powell
71cbae81b0 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Adam Powell
178097727f Fix bug 2859423 - action bar: need a way to choose item in spinner
Change-Id: Idf9c222e5d8f27b4339a6df7d14f3f10dcb4be2c
2010-07-21 13:56:35 -07:00
Ben Komalo
d6665fc48e Merge "Relay stopLoading() on the loader from LoaderInfo.stop()" 2010-07-21 13:28:45 -07:00
Ben Komalo
f5100a7823 Relay stopLoading() on the loader from LoaderInfo.stop()
Change-Id: Ie48b303cef4fe1b284d4ed6a1b310f3dcef20c91
2010-07-21 13:10:30 -07:00
Adam Powell
e4e34965a6 Fix docs
Change-Id: Ib96b693f6da716f87c5ce963ddc69f6bad3da6be
2010-07-20 23:16:09 -07:00
Adam Powell
ac695c608b Refactored contextual modes out of action bar.
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
2010-07-20 18:56:59 -07:00
The Android Open Source Project
bd7599ff0c am fcff6910: merge from open-source master
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
2010-07-20 10:28:35 -07:00
The Android Open Source Project
fcff691057 merge from open-source master
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
2010-07-20 10:25:37 -07:00
Madan Ankapura
ae96f634ec typo fixed
Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
2010-07-19 15:43:00 -07:00
The Android Open Source Project
87497936f5 am 27dfb307: merge from open-source master
Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03'

* commit '27dfb3070adc90ddfcc398a352de1741f52add03':
  Replaced deprecated calls to setButton and setButton2
2010-07-19 12:54:10 -07:00
The Android Open Source Project
27dfb3070a merge from open-source master
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
2010-07-19 12:49:39 -07:00
The Android Open Source Project
18814b4c8a am 9ab60279: merge from open-source master
Merge commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6'

* commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6':
  Replaced deprecated setButton Methodcalls
2010-07-19 12:48:47 -07:00
The Android Open Source Project
9ab60279fd merge from open-source master
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
2010-07-19 12:17:53 -07:00
Romain Guy
4598804045 Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
5671b28092 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Dianne Hackborn
781d347479 am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961'

* commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961':
  Implement native key pre-dispatching to IMEs.
2010-07-16 09:12:29 -07:00
Brad Fitzpatrick
74446cef55 am f96c2719: am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7'

* commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7':
  StrictMode: batch drop box writes for system apps
2010-07-15 23:05:44 -07:00
Brad Fitzpatrick
d2f6c7fe73 am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d'

* commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d':
  StrictMode: gather and return violating stacks in Binder replies
2010-07-15 23:05:39 -07:00
Christopher Tate
6ba776ad34 am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
2010-07-15 23:05:27 -07:00
Dianne Hackborn
9c37e5add9 am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
  Implement native key pre-dispatching to IMEs.
2010-07-15 22:24:53 -07:00
Dianne Hackborn
2c6081ce35 Implement native key pre-dispatching to IMEs.
This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code.  It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.

Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in.  Unfortunately IMEs don't
currently provide this information. :p

Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
2010-07-15 22:05:33 -07:00
Brad Fitzpatrick
f96c2719c3 am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp

* commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
  StrictMode: batch drop box writes for system apps
2010-07-15 15:47:05 -07:00
Brad Fitzpatrick
3e5e21d4dc am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp

* commit '1772c34e5331a6456c8a93051192d19ff873c062':
  StrictMode: gather and return violating stacks in Binder replies
2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
0c36c96f2a Merge "StrictMode: batch drop box writes for system apps" into gingerbread 2010-07-15 15:43:03 -07:00
Brad Fitzpatrick
1772c34e53 Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 2010-07-15 15:42:41 -07:00
Christopher Tate
078ccbdbb9 am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
2010-07-15 15:03:32 -07:00
Dianne Hackborn
4911b783aa Fix bug where loader listener would be registered twice.
Also change LoaderManager to an interface.

Change-Id: Ife6d123e56cc6f63b6fe902afac35b2673761e60
2010-07-15 14:43:13 -07:00
Christopher Tate
6cce32b6ad Add native C APIs for working with the Asset Manager
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
2010-07-15 14:28:21 -07:00
Brad Fitzpatrick
ad13b9807b StrictMode: batch drop box writes for system apps
Change-Id: Iab49c15ecccefea1d36d86271e1ceb37d79e9449
2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
5b747191ff StrictMode: gather and return violating stacks in Binder replies
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.

Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
2010-07-15 13:18:05 -07:00
Jim Miller
839458d8d4 resolved conflicts for merge of e03952c0 to master
Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
2010-07-14 17:21:00 -07:00
Jim Miller
e03952c042 am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp

* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
  Fix 2797185: Re-enable thumbnail generation in framework
2010-07-14 17:02:36 -07:00
Jim Miller
9d42c7f75c Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 2010-07-14 16:59:52 -07:00