diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:35 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:35 -0800 |
| commit | 4df2423a947bcd3f024cc3d3a1a315a8dc428598 (patch) | |
| tree | e7dac2c5a367b169e7f05a36058cf470e93f003b /packages | |
| parent | c474dec3ffa1c0fe37edb3e701684188f7e8e7bc (diff) | |
| download | frameworks_base-4df2423a947bcd3f024cc3d3a1a315a8dc428598.zip frameworks_base-4df2423a947bcd3f024cc3d3a1a315a8dc428598.tar.gz frameworks_base-4df2423a947bcd3f024cc3d3a1a315a8dc428598.tar.bz2 | |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/etc/favorites.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/packages/SettingsProvider/etc/favorites.xml b/packages/SettingsProvider/etc/favorites.xml index 0ecf8a6..ae74b8e 100644 --- a/packages/SettingsProvider/etc/favorites.xml +++ b/packages/SettingsProvider/etc/favorites.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,4 +19,5 @@ <favorite package="com.android.contacts" class="com.android.contacts.DialtactsContactsEntryActivity" screen="1" x="1" y="3" /> <favorite package="com.android.browser" class="com.android.browser.BrowserActivity" screen="1" x="2" y="3" /> <favorite package="com.google.android.apps.maps" class="com.google.android.maps.MapsActivity" screen="1" x="3" y="3" /> + <favorite package="com.android.vending" class="com.android.vending.AssetBrowserActivity" screen="1" x="0" y="2" /> </favorites> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index f8b5700..2f32ab7 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -63,7 +63,7 @@ class DatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "SettingsProvider"; private static final String DATABASE_NAME = "settings.db"; - private static final int DATABASE_VERSION = 33; + private static final int DATABASE_VERSION = 34; private Context mContext; @@ -370,6 +370,18 @@ class DatabaseHelper extends SQLiteOpenHelper { } upgradeVersion = 33; } + + if (upgradeVersion == 33) { + // Set the default zoom controls to: tap-twice to bring up +/- + db.beginTransaction(); + try { + db.execSQL("INSERT INTO system(name,value) values('zoom','2');"); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + upgradeVersion = 34; + } if (upgradeVersion != currentVersion) { Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion |