Grace Kloba d7f2036aaa resolved conflicts for merge of 21d769da to master

2009-07-15 14:38:20 -07:00

..

accessibilityservice

…

accounts

- add the DIRTY and VERSION columns to the ContactsProvider2 Groups contract

2009-07-14 11:57:09 -07:00

annotation

…

app

am 1fffbd97: Fix keyboard not showing for global search on Dream. Rather than trying to call the hidden showSoftInputUnchecked method to show the IME in SearchDialog#show(), override onWindowFocusChanged in our subclass of AutoCompleteTextView so that whenever it gets

2009-07-14 18:56:32 -07:00

appwidget

Clamp app widget updates from updatePeriodMillis to a minimum of 30 minutes.

2009-07-15 09:58:08 -07:00

backup

Make the backup manager do nothing when backup is turned off.

2009-07-13 09:08:59 -07:00

bluetooth

am 03255de3: Merge change 4757 into donut

2009-06-19 11:31:37 -07:00

content

am b5c735d3: Merge change 7106 into donut

2009-07-14 16:18:34 -07:00

database

am eb717b9c: Merge change 4477 into donut

2009-06-22 13:04:50 -07:00

ddm

…

debug

…

emoji

…

gesture

Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.

2009-07-10 14:11:26 -07:00

hardware

Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)

2009-07-02 10:04:20 -07:00

inputmethodservice

…

net

Remove all our old high priority knowledge since WebCore will manage it.

2009-07-15 15:48:02 -04:00

os

resolved conflicts for merge of b06ea706 to master

2009-07-14 12:51:00 -07:00

pim

Changes for new sync.

2009-07-06 10:45:38 -07:00

preference

am a013a98f: Fix the nested preferences title. Again.

2009-06-29 20:17:53 -07:00

provider

Add Uri for filtering the aggregate summary on group name.

2009-07-15 12:47:53 -07:00

security

…

server

Register OPUSH - Bluetooth OPP service record.

2009-07-14 21:32:14 -07:00

speech

Unhide required definitions in TextToSpeech.Engine that cover return codes and

2009-07-14 17:37:07 -07:00

syncml

am 3e3324ba: Merge the change in cupcake_dcm so that Contacts app is able to use it.

2009-06-21 21:44:01 -07:00

test

Fix bug 1927213 test failures.

2009-06-18 18:36:37 -07:00

text

am b0b815da: Merge change 5845 into donut

2009-07-01 22:44:33 -07:00

util

am 1ecf5d28: Re-implementation of large screen support using window manager. * added background filler surface to fill the outer rim. Using the same layer as dim surface because they never co-exists (in the same window) * clean up the obsolete code in Compatibilt

2009-07-08 15:59:16 -07:00

view

am b5c735d3: Merge change 7106 into donut

2009-07-14 16:18:34 -07:00

webkit

resolved conflicts for merge of 21d769da to master

2009-07-15 14:38:20 -07:00

widget

am fa8904a6: Merge change 7012 into donut

2009-07-14 16:03:30 -07:00

package.html

…