diff options
| author | Sara Ting <sarating@google.com> | 2012-08-08 17:21:03 -0700 |
|---|---|---|
| committer | Sara Ting <sarating@google.com> | 2012-08-08 17:21:03 -0700 |
| commit | a6ff5f0570e63e46a085bc82dc4256517e248f88 (patch) | |
| tree | 7df63337d42e107ec724502ee0571e7b0493e16a | |
| parent | 537f43d0eb9e86133ea8ed95862dfdbd788bba67 (diff) | |
| download | android_packages_apps_Calendar-a6ff5f0570e63e46a085bc82dc4256517e248f88.tar.gz android_packages_apps_Calendar-a6ff5f0570e63e46a085bc82dc4256517e248f88.tar.bz2 android_packages_apps_Calendar-a6ff5f0570e63e46a085bc82dc4256517e248f88.zip | |
Move 'About Calendar' screen to extensions folder.
Change-Id: I8b3b4661dae584735c52667f8d253506fedf0b41
| -rw-r--r-- | extensions_src/com/android/calendar/extensions/AboutPreferences.java (renamed from src/com/android/calendar/AboutPreferences.java) | 4 | ||||
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | res/xml/calendar_settings_headers.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/calendar/AboutPreferences.java b/extensions_src/com/android/calendar/extensions/AboutPreferences.java index 37dd5e3e..43a15afa 100644 --- a/src/com/android/calendar/AboutPreferences.java +++ b/extensions_src/com/android/calendar/extensions/AboutPreferences.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.calendar; +package com.android.calendar.extensions; import android.app.Activity; import android.content.pm.PackageInfo; @@ -22,6 +22,8 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; import android.preference.PreferenceFragment; +import com.android.calendar.R; + public class AboutPreferences extends PreferenceFragment { private static final String BUILD_VERSION = "build_version"; diff --git a/proguard.flags b/proguard.flags index 14af6b34..c2968c95 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,6 +1,6 @@ -keep class com.android.calendar.selectcalendars.SelectCalendarsSyncFragment -keep class com.android.calendar.OtherPreferences --keep class com.android.calendar.AboutPreferences +-keep class com.android.calendar.extensions.AboutPreferences -keepclassmembers class com.android.calendar.AllInOneActivity { *** setControlsOffset(...); } diff --git a/res/xml/calendar_settings_headers.xml b/res/xml/calendar_settings_headers.xml index a5a5ae72..431b4055 100644 --- a/res/xml/calendar_settings_headers.xml +++ b/res/xml/calendar_settings_headers.xml @@ -19,6 +19,6 @@ <header android:fragment="com.android.calendar.GeneralPreferences" android:title="@string/menu_general_preferences" /> - <header android:fragment="com.android.calendar.AboutPreferences" + <header android:fragment="com.android.calendar.extensions.AboutPreferences" android:title="@string/menu_about_preferences" /> </preference-headers> |