Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
De-classicify Android Browser part 2
Browse files Browse the repository at this point in the history
Bug: 10427705

Allows Browser to compile even when WebViewClassic is no longer in
frameworks/base. The deleted functionality was already disabled at
runtime when using non-classic webview.

Change-Id: I21b58ec52ac059c699b49a2dd80008d9a9e6791a
  • Loading branch information
joth76 committed Aug 26, 2013
1 parent 56b5495 commit f9e1705
Show file tree
Hide file tree
Showing 26 changed files with 16 additions and 2,214 deletions.
3 changes: 0 additions & 3 deletions res/menu/browser.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@
android:id="@+id/ua_desktop_menu_id"
android:checkable="true"
android:title="@string/ua_switcher_desktop" />
<item
android:id="@+id/save_snapshot_menu_id"
android:title="@string/menu_save_snapshot" />
</group>
<group
android:id="@+id/SNAPSHOT_MENU">
Expand Down
5 changes: 0 additions & 5 deletions res/xml/general_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
android:defaultValue="true"
/>

<PreferenceScreen
android:fragment="com.android.browser.AutoFillSettingsFragment"
android:key="autofill_profile"
android:title="@string/pref_autofill_profile_editor"
android:summary="@string/pref_autofill_profile_editor_summary" />
</PreferenceCategory>

</PreferenceScreen>
29 changes: 0 additions & 29 deletions src/com/android/browser/AutoFillProfileDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.provider.BaseColumns;
import android.util.Log;
import android.webkit.WebSettingsClassic.AutoFillProfile;

public class AutoFillProfileDatabase {

Expand Down Expand Up @@ -95,34 +94,6 @@ private SQLiteDatabase getDatabase(boolean writable) {
return writable ? mOpenHelper.getWritableDatabase() : mOpenHelper.getReadableDatabase();
}

public void addOrUpdateProfile(final int id, AutoFillProfile profile) {
final String sql = "INSERT OR REPLACE INTO " + PROFILES_TABLE_NAME + " ("
+ Profiles._ID + ","
+ Profiles.FULL_NAME + ","
+ Profiles.EMAIL_ADDRESS + ","
+ Profiles.COMPANY_NAME + ","
+ Profiles.ADDRESS_LINE_1 + ","
+ Profiles.ADDRESS_LINE_2 + ","
+ Profiles.CITY + ","
+ Profiles.STATE + ","
+ Profiles.ZIP_CODE + ","
+ Profiles.COUNTRY + ","
+ Profiles.PHONE_NUMBER
+ ") VALUES (?,?,?,?,?,?,?,?,?,?,?);";
final Object[] params = { id,
profile.getFullName(),
profile.getEmailAddress(),
profile.getCompanyName(),
profile.getAddressLine1(),
profile.getAddressLine2(),
profile.getCity(),
profile.getState(),
profile.getZipCode(),
profile.getCountry(),
profile.getPhoneNumber() };
getDatabase(true).execSQL(sql, params);
}

public Cursor getProfile(int id) {
final String[] cols = {
Profiles.FULL_NAME,
Expand Down
291 changes: 0 additions & 291 deletions src/com/android/browser/AutoFillSettingsFragment.java

This file was deleted.

0 comments on commit f9e1705

Please sign in to comment.