diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-07-16 18:07:05 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-07-16 18:13:07 -0700 |
| commit | e6c33066d3fc9f558de5dd7a89137414d7726300 (patch) | |
| tree | f3acf4b145a066f76ffca135779ae5e6ce7bba46 | |
| parent | 5c0a812990bef078d85a057f279a18bb3d000a24 (diff) | |
| download | android_packages_apps_UnifiedEmail-e6c33066d3fc9f558de5dd7a89137414d7726300.tar.gz android_packages_apps_UnifiedEmail-e6c33066d3fc9f558de5dd7a89137414d7726300.tar.bz2 android_packages_apps_UnifiedEmail-e6c33066d3fc9f558de5dd7a89137414d7726300.zip | |
Minor fixes for UnifiedEmail
Change-Id: Iff87382778759b409b75e454f4dd5efd9a2020c1
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/mail/providers/Folder.java | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 1cf0bb6f9..84f7b4583 100644 --- a/Android.mk +++ b/Android.mk @@ -19,7 +19,8 @@ chips_dir := ../../../frameworks/ex/chips/res #Include res dir from photoviewer photo_dir := ../../../frameworks/opt/photoviewer/res -res_dirs := $(chips_dir) $(photo_dir) res +res_dirs := res $(chips_dir) $(photo_dir) + ################################################## # Build APK diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5fb419c86..febfebcb2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -42,7 +42,7 @@ android:label="@string/app_name" android:name=".ui.MailActivity" android:launchMode="singleTop" - android:uiOptions="splitActionBarWhenNarrow"> + android:theme="@style/PlainUnifiedEmailTheme" > <intent-filter > <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/src/com/android/mail/providers/Folder.java b/src/com/android/mail/providers/Folder.java index ca37f24a1..c1ddf0080 100644 --- a/src/com/android/mail/providers/Folder.java +++ b/src/com/android/mail/providers/Folder.java @@ -328,7 +328,7 @@ public class Folder implements Parcelable, Comparable<Folder> { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(id); dest.writeString(persistentId); - dest.writeParcelable(folderUri.fullUri, 0); + dest.writeParcelable(folderUri != null ? folderUri.fullUri : null, 0); dest.writeString(name); dest.writeInt(capabilities); // 1 for true, 0 for false. |