Commit Graph

1195 Commits

Author SHA1 Message Date
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00
Steve Howard
e10330fa28 am efb8b427: am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9'

* commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9':
  Avoid NPE when viewing failed legacy download with no local path
2010-09-30 19:46:23 -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
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
Steve Howard
825bdff3b8 resolved conflicts for merge of 538c3fa3 to master
Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
2010-09-30 14:41:59 -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
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
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
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
2010-09-28 17:28:43 -07:00
Adam Powell
c49c17314d Added AlertDialog.Builder#getContext
Change-Id: Ic3033a4eff67f507aa39dacfc4c8984a9ee142c1
2010-09-28 17:13:31 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Dianne Hackborn
cca1f0e347 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-27 18:05:44 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Adam Powell
c63806d852 Holo themes and assets in progress
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
2010-09-27 17:10:30 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
2010-09-27 12:45:31 -07:00
Dianne Hackborn
8313fc7e94 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-26 21:31:47 -07:00
Joe Onorato
091e1b8a86 Implement disable() on the status bar.
This includes adding the new DISABLE_NAVIGATION flag.

Bug: 3000770
Change-Id: I6d1c3586198e13e06b5d26e8b23a9495dc4ba02e
2010-09-26 19:07:51 -07:00
Dianne Hackborn
846df9f517 resolved conflicts for merge of 8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
2010-09-23 20:33:19 -07:00
Dianne Hackborn
8952a4488e am 287952c3: Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp

* commit '287952c35e148811c106bc0f5036eabf20f71562':
  Fix issue #3022508: Crash during media scan
2010-09-23 16:04:23 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Dianne Hackborn
625ac271f8 Work on fragments in layouts.
- Change semantics if IDs associated with these fragments, to
  work correctly when placed in a container.  If the container
  has an ID or you have supplied a tag, the fragment's ID is
  optional.

- To do this, there is a new LayoutInflater API that allows code
  creating views to access the parent container that view will
  be in.

- Fix issues with state management around these fragments.  Now
  correctly retains state when switching to a layout that doesn't
  include the fragment.

Also:

- Add new simple list layouts for items that want to show an
  activated state.
- Add new Activity.dump() that can be invoked with adb shell
  dumpsys; the default implementation dumps fragment state.

Change-Id: I192f35e3ea8c53fbd26cf909095f2a994abfc1b6
2010-09-21 22:08:50 -07:00
Amith Yamasani
04f8040d1e Merge "Make the breadcrumbs touchable for navigation." 2010-09-21 14:51:03 -07:00
Vasu Nori
3c7131ffca bring database code in master for 'adb bugreport' in sync with ginger
Change-Id: Ibe9eb07db363b483a07645e9644d75db51132808
2010-09-21 14:36:57 -07:00
Amith Yamasani
dcfb9f7ae6 Make the breadcrumbs touchable for navigation. 2010-09-21 14:22:09 -07:00
Vasu Nori
b745ec9542 am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp

* commit '173ea0912af296c6e80d14b764046534b316d21f':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
2010-09-21 12:25:39 -07:00
Vasu Nori
9540a8d320 DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
output now looks like the following
  SQL
                  heap:      551          MEMORY_USED:      551
    PAGECACHE_OVERFLOW:      113          MALLOC_SIZE:       50

 DATABASES
    pgsz   dbsz   Lookaside(b)  Dbname
       1    148           500  contacts2.db
       1      8             0    (attached) presence_db
       1     18            31  :memory:SQL

Change-Id: I8bb65a522fd9478ff2f6a8c27e69f9e6c10aef8a
2010-09-21 12:07:24 -07:00
Scott Main
cd155a0672 am aac4630c: am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957'

* commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957':
  provide link to backup guide above the fold
2010-09-20 19:33:15 -07:00
Dianne Hackborn
48a781a0a5 am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339'

* commit '4b187e804fdfdbc825e17646e82e0218e316a339':
  Some battery improvements:
2010-09-20 19:33:06 -07:00
Scott Main
aac4630cc5 am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
2010-09-20 16:40:46 -07:00
Scott Main
a4270e7e1e am 73e150c8: provide link to backup guide above the fold
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
2010-09-20 16:37:32 -07:00
Dianne Hackborn
4b187e804f am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
2010-09-20 16:34:45 -07:00
Dianne Hackborn
ce2ef766ca Some battery improvements:
- New API for iterating over history that will allow a better implementation
  in the future.
- Now do writes asynchronously.

Also improve the documentation for Activity.onRetainNonInstanceState().

Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
2010-09-20 16:25:01 -07:00
Scott Main
73e150c886 provide link to backup guide above the fold
Change-Id: I84ad3fbd4c3c7793fbf330d6a2be5cab611a9b26
2010-09-20 14:11:18 -07:00
Joe Onorato
ef1e7763c2 Tablet ticker.
Change-Id: Ia3db5cc29eac1703123de3e1c6dc7c22e7d024eb
2010-09-20 14:14:02 -04:00
Dianne Hackborn
c6669ca632 Add API for showing breadcrumbs of fragment back stack.
This adds a simple API to have your back stack automatically
shown as bread crumbs in the action bar.  Introduces some APIs
to retrieve the current back stack.

Also fix a little bug in the "activated" state where it was
being propagated down the hierarchy as "selected". :p  And from
that, fix the standard colors to be reasonable when in the
activated state.

Finally PreferenceActivity is updated to take advantage of
bread crumbs to show your place in the preferences.

Change-Id: I9d633bedf8d7c6e4ed9b25cb9698faa66c7dd9a4
2010-09-16 18:36:04 -07:00
Joe Onorato
9316232130 Fix broken javadoc.
Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
2010-09-16 16:01:53 -04:00
Amith Yamasani
e678f46ec4 Query refinement feature in SearchView.
New method : setQueryRefinementEnabled() which will either enable all suggestions
to have the little query refinement icon in the right or just the ones that have
a bit set in the new SUGGEST_FLAGS column of the suggestion provider cursor.
2010-09-16 06:37:26 -07:00
Brad Fitzpatrick
b835d9abd6 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Leon Scroggins III
ad533cd555 am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'

* commit '720d5985f5d31912c97b7e549230d241e58c1298':
  Add an option to hide the Voice Search icon.
2010-09-15 07:08:49 -07:00
Brad Fitzpatrick
f26ac1f8ed am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
96d6c3454c Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 2010-09-14 11:37:13 -07:00
Leon Scroggins III
720d5985f5 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17 am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Brad Fitzpatrick
50d66f9fcd Unify some duplicate StrictMode-enabling code.
Change-Id: Ifb92f35d9e245dbdb5e201597d8be702bce9e8b8
2010-09-14 08:22:30 -07:00
Leon Scroggins III
4a02800946 Add an option to hide the Voice Search icon.
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.

Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
2010-09-14 10:56:25 -04:00