From 043bcc04f31c503e4271a68da96fc72427948732 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Thu, 16 Dec 2010 13:59:56 -0800 Subject: [PATCH] fix the TooManyDeletes to show up again It was moved so it was no longer in the location that SyncManager expected. I fixed it by (a) moving it to the SyncManager directory and by (b) changing the SyncManager to refer to it by class rather than by class name, which means it will now check for it at compile time, not run time. Bug: 3289922 Change-Id: I93fb78432e66ff14e1f750b06f79425c457399c2 --- AndroidManifest.xml | 9 -- res/values/strings.xml | 10 -- .../accounts/SyncActivityTooManyDeletes.java | 134 ------------------ 3 files changed, 153 deletions(-) delete mode 100644 src/com/android/settings/accounts/SyncActivityTooManyDeletes.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fdbfd157fcb..b82d931f799 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1073,15 +1073,6 @@ android:label="@string/header_add_an_account" android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> - - - - - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 2b7ccb2537f..e1f0f96b85b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3052,8 +3052,6 @@ found in the list of installed applications. Account and Sync Settings - - Delete limit exceeded Back up settings @@ -3070,14 +3068,6 @@ found in the list of installed applications. Calendar Contacts - - There are %1$d deleted items for %2$s, account %3$s. What would you like to do? - - Delete the items. - - Undo the deletes. - - Do nothing for now. Welcome to Google sync! \nA Google approach to synchronizing data to allow access to your contacts, appointments, and more from wherever you are. diff --git a/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java b/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java deleted file mode 100644 index b31561cc160..00000000000 --- a/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2007 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.accounts; - -import com.android.settings.R; - -import android.accounts.Account; -import android.app.Activity; -import android.content.ContentResolver; -import android.os.Bundle; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.LinearLayout; -import android.widget.ListAdapter; -import android.widget.ListView; -import android.widget.TextView; - -/** - * Presents multiple options for handling the case where a sync was aborted because there - * were too many pending deletes. One option is to force the delete, another is to rollback - * the deletes, the third is to do nothing. - */ -public class SyncActivityTooManyDeletes extends Activity - implements AdapterView.OnItemClickListener { - - private long mNumDeletes; - private Account mAccount; - private String mAuthority; - private String mProvider; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle extras = getIntent().getExtras(); - if (extras == null) { - finish(); - return; - } - - mNumDeletes = extras.getLong("numDeletes"); - mAccount = (Account) extras.getParcelable("account"); - mAuthority = extras.getString("authority"); - mProvider = extras.getString("provider"); - - // the order of these must match up with the constants for position used in onItemClick - CharSequence[] options = new CharSequence[]{ - getResources().getText(R.string.sync_really_delete), - getResources().getText(R.string.sync_undo_deletes), - getResources().getText(R.string.sync_do_nothing) - }; - - ListAdapter adapter = new ArrayAdapter(this, - android.R.layout.simple_list_item_1, - android.R.id.text1, - options); - - ListView listView = new ListView(this); - listView.setAdapter(adapter); - listView.setItemsCanFocus(true); - listView.setOnItemClickListener(this); - - TextView textView = new TextView(this); - CharSequence tooManyDeletesDescFormat = - getResources().getText(R.string.sync_too_many_deletes_desc); - textView.setText(String.format(tooManyDeletesDescFormat.toString(), - mNumDeletes, mProvider, mAccount.name)); - - final LinearLayout ll = new LinearLayout(this); - ll.setOrientation(LinearLayout.VERTICAL); - final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); - ll.addView(textView, lp); - ll.addView(listView, lp); - - // TODO: consider displaying the icon of the account type -// AuthenticatorDescription[] descs = AccountManager.get(this).getAuthenticatorTypes(); -// for (AuthenticatorDescription desc : descs) { -// if (desc.type.equals(mAccount.type)) { -// try { -// final Context authContext = createPackageContext(desc.packageName, 0); -// ImageView imageView = new ImageView(this); -// imageView.setImageDrawable(authContext.getResources().getDrawable(desc.iconId)); -// ll.addView(imageView, lp); -// } catch (PackageManager.NameNotFoundException e) { -// } -// break; -// } -// } - - setContentView(ll); - } - - public void onItemClick(AdapterView parent, View view, int position, long id) { - // the constants for position correspond to the items options array in onCreate() - if (position == 0) startSyncReallyDelete(); - else if (position == 1) startSyncUndoDeletes(); - finish(); - } - - private void startSyncReallyDelete() { - Bundle extras = new Bundle(); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_OVERRIDE_TOO_MANY_DELETIONS, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true); - ContentResolver.requestSync(mAccount, mAuthority, extras); - } - - private void startSyncUndoDeletes() { - Bundle extras = new Bundle(); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_DISCARD_LOCAL_DELETIONS, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true); - ContentResolver.requestSync(mAccount, mAuthority, extras); - } -}