Commit Graph

899 Commits

Author SHA1 Message Date
Vasu Nori
4015de2a08 add column to downloads table to store error msg when a download fails
useful for debugging for bugs like bug:3187299
without this error message, one doesn't know WHY downloads
fail.
there is a STOPSHIP comment around storage of this error
message in database.

Change-Id: I1fa49ee9eb97be16aced1611ab30a286b0b6c8d2
2010-11-11 15:22:13 -08:00
satok
723a27ef3d Save the history of InputMethodSubtype for reverting the subtype when IME was changed.
- Re-revert the change https://android-git.corp.google.com/g/#q,78962,n,z
*** If you want to see the diff between reverted change and new change, please see the diff between patch set 1 and the latest patch set

- TODO: Add a public function "switchToLastInputMethod"

Change-Id: Ic85d54b3b68e47a22360acaeb81202a366a34586
2010-11-11 17:13:10 +09:00
Fabrice Di Meglio
c184a0b9be Merge "Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)" 2010-11-09 16:13:22 -08:00
Tadashi G. Takaoka
0ba75bb22c Revert "Add a history of InputMethodSubtype for getting the last subtype of selected IME when IME was changed."
This reverts commit 1ab852fbcf.
2010-11-09 12:19:32 -08:00
satok
1ab852fbcf Add a history of InputMethodSubtype for getting the last subtype of selected IME when IME was changed.
Change-Id: I66752a881726c0ce2816a9d54de60fb0d992e968
2010-11-09 16:43:00 +09:00
Ficus Kirkpatrick
553a53ef9f Make saveRecentQuery() async.
Bug: 3163612
Change-Id: Idd3c1925e0f1dc3272dd1303d8f2907c5c5fca8b
2010-11-08 16:11:54 -08:00
Irfan Sheriff
36f7413dab add frequency band control API
Change-Id: I6cc6cdef27d493d4ef76cec17fdca7e49d9dc8d7
2010-11-08 10:09:17 -08:00
Vasu Nori
5be894e636 add API to return Uri for the given downloaded file id & get mimetype
Change-Id: I1f5dd734e394db0056579a3a0c26862fee27981e
2010-11-04 17:57:24 -07:00
Fabrice Di Meglio
2c410a18fc Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)
- modify EventsEntity iterator to take care of the SYNC_ADAPTER_DATA column

Change-Id: I3d08a4ebdca5b595aad7c56b9f5d6259522297e2
2010-11-04 17:30:44 -07:00
Daniel Sandler
b73617de46 Rotation lock.
IWindowManager now supports two new methods,
freezeRotation() and thawRotation(), that allow a caller to
temporarily stash the device's current rotation as the
default rotation (when no other constraints are present).

The system bar uses this to implement a user-accessible
rotation lock by calling freezeRotation() and then turning
off accelerometer-based display rotation; unless overridden
by an app, the display will continue to appear in the frozen
rotation until the rotation is unlocked by the user (either
via the rotation lock icon in the system bar or by checking
"rotate screen automatically" in Settings).

Bug: 2949639
Change-Id: Icd21c169d1053719590e72401f229424b254622f
2010-11-04 16:55:29 -04:00
Mike Lockwood
0b20b77ff5 MediaStore: Make definitions for Files table public
This provides a public API for the new MediaProvider support for
arbitrary file types.  MediaProvider is no longer limited to supporting
only media (audio, video, image and playlist files).
This also allows querying across multiple media file types and supports
navigating the directory hierarchy of the media storage via database queries.

BUG: 2984284

Change-Id: I6222a6d601a4641cc7e544335e45d05b194532b1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-11-04 13:20:06 -04:00
Irfan Sheriff
ed4f28b492 Set country code in the driver and remove channel set
With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
2010-11-02 16:35:56 -07:00
Daniel Lehmann
dd384a7453 Added missing label and char limits
Change-Id: I950c065dcf965872a541dfc4b55daec045d65d6a
2010-11-01 18:40:50 -07:00
Bjorn Bringert
24abb66c85 Deprecate Settings.System.SHOW_WEB_SUGGESTIONS
In earlier Android versions, Quick Search Box set this setting,
and the browser and QSB read it. Now the Browser has stopped
using it, and QSB has been unbundled and removed from the system
settings UI.

Applications that show web suggestions should have their own settings
to control it instead.

Bug: 3021480
Change-Id: I4e62bf26944287f804e50eb93843484a0356fffb
2010-10-29 09:03:06 +01:00
Daniel Lehmann
1fb39f0ffc Add API and strings for the contact-field "Relation"
Bug:3134946
Change-Id: Ic2163abfaf0ca16cbd24ea68cbace5144b688eab
2010-10-28 13:40:38 -07:00
Vasu Nori
4c6e5dfa1c make notifications appear during downloading AND after completion
bug:3132773
Change-Id: I012859fa86055f322069d5120b110c4c8887fb61
2010-10-27 23:09:51 -07:00
satok
86417ea3f8 Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER
Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f
2010-10-27 15:27:22 +09:00
Daniel Lehmann
cde1ac6006 Add an extra to allow specifying the account for creation of new contacts
Change-Id: I6bbf1025e35bbc1d2acff747b08c07530bec2b8c
2010-10-21 20:40:11 -07:00
Nick Pelly
886fd91833 am c0e93a84: am 7ea5c45e: NFC settings cleanup.
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'

* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
  NFC settings cleanup.
2010-10-21 13:50:09 -07:00
Dmitri Plotnikov
beb2178b49 Making multi-values extra in contact INSERT intent public.
Change-Id: I27da6278027a8b6a18b8dea756aa4ed8920ec748
2010-10-21 13:31:57 -07:00
Nick Pelly
c0e93a849f am 7ea5c45e: NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup.
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-21 03:54:51 -07:00
Vasu Nori
c63c320c09 Merge "remove duplicate code" 2010-10-20 13:46:19 -07:00
Vasu Nori
ef7e33b9b8 remove duplicate code
Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
2010-10-20 13:37:33 -07:00
Irfan Sheriff
4f5f7c9683 Fix wake and scan behavior
- Add wakelock for driver start/stop to ensure a wifilock
  acquisition kick starts driver. Also cleaned up state machine
  driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
  reconnections when wifilock exists or when user chooses
  never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
2010-10-20 12:04:21 -07:00
Dmitri Plotnikov
bb54929f76 Adding Insert.DATA extra for new/edit contact intents.
This is a way to supply any amount of arbitrary initial
values for the newly created contacts or additional
data for an existing contact.

Change-Id: Iec050cf9177be2ffb115e473dcd43ef37e5bbd5e
2010-10-18 20:37:02 -07:00
Kenny Root
9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
2010-10-15 11:20:42 -07:00
Daniel Lehmann
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-14 18:34:17 -07:00
Jim Miller
66ad9e7207 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Jim Miller
253a5ef886 Fix 3024528: Add owner info to SecureSettings.
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
2010-10-14 15:51:55 -07:00
Daniel Lehmann
2f14c62125 DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Bug:3082932

Change-Id: I28dbb21a30fbe22e6e58a8dda534fc9110621c85
2010-10-14 11:26:18 -07:00
Wink Saville
1b422d8cd8 am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread
Merge commit '090ac9f7dd883aa75c899745182471d409a2b762'

* commit '090ac9f7dd883aa75c899745182471d409a2b762':
  Remove some PII.
2010-10-13 19:40:16 -07:00
Vasu Nori
c6bf3eaab4 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
2010-10-13 16:52:57 -07:00
Vasu Nori
216fa22791 bug:3069735 in Download UI app, handle deletes correctly
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )

2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
    mediaprovider_uri = downloaded file's content_uri in mediaprovider db
    deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set

Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
2010-10-13 16:18:44 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -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
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
Jeff Hamilton
a2f9266075 Add a Settings table to BrowserContract.
It contains global settings that are shared
between the Browser app and the sync adapters.

Change-Id: I294ad8b03a44686858fc61a3ae6bbab86f124f99
2010-09-28 16:41:10 -05:00
Winson Chung
4d5a8b5587 am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'

* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 21:03:17 -07:00
Winson Chung
55ee8f9329 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 15:08:57 -07:00
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
2010-09-27 15:04:43 -07:00
Mike Lockwood
bdb05df757 MediaStore: Add helper method to create Uri for querying genre for an audio file
Change-Id: Ic08260854ef2555682c1a169e7ceb9ecc91628c6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-27 13:16:43 -04:00
Patrick Scott
a0b49cfc0c am 888bcdbe: am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0'

* commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0':
  Add new Alarm provider class for setting an alarm.
2010-09-24 15:22:49 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
2010-09-24 11:36:51 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm.
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
2010-09-24 13:52:14 -04:00