am be74fb8d: am 43b8946f: am d9f156dd: Coalescing multiple print job notifications (Settings)

* commit 'be74fb8d729828642cce0514e1043c290e8ceea0':
  Coalescing multiple print job notifications (Settings)
This commit is contained in:
Svetoslav
2013-10-10 10:24:35 -07:00
committed by Android Git Automerger
4 changed files with 27 additions and 31 deletions

View File

@@ -81,6 +81,7 @@ import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.location.LocationSettings;
import com.android.settings.nfc.AndroidBeam;
import com.android.settings.nfc.PaymentSettings;
import com.android.settings.print.PrintJobSettingsFragment;
import com.android.settings.print.PrintServiceSettingsFragment;
import com.android.settings.print.PrintSettingsFragment;
import com.android.settings.tts.TextToSpeechSettings;
@@ -350,6 +351,7 @@ public class Settings extends PreferenceActivity
NotificationAccessSettings.class.getName(),
ManageAccountsSettings.class.getName(),
PrintSettingsFragment.class.getName(),
PrintJobSettingsFragment.class.getName(),
TrustedCredentialsSettings.class.getName(),
PaymentSettings.class.getName(),
KeyboardLayoutPickerFragment.class.getName()
@@ -1114,4 +1116,5 @@ public class Settings extends PreferenceActivity
public static class TrustedCredentialsSettingsActivity extends Settings { /* empty */ }
public static class PaymentSettingsActivity extends Settings { /* empty */ }
public static class PrintSettingsActivity extends Settings { /* empty */ }
public static class PrintJobSettingsActivity extends Settings { /* empty */ }
}