diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-07-04 15:47:19 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-07-04 15:47:19 +0100 |
| commit | 7fd5361e26fbf62b8ea3f30daa2bd4a6d2e5735c (patch) | |
| tree | 3c909fde6ea00778d76e3f7f115eb8a4bb4943a0 | |
| parent | 8598a29758678a0500302c6c5ce68db7a5f32ee5 (diff) | |
| parent | 1d0056269cdc3cbcad5bb680bfdc4985f0c58c66 (diff) | |
| download | android_frameworks_opt_photoviewer-cm-12.1.tar.gz android_frameworks_opt_photoviewer-cm-12.1.tar.bz2 android_frameworks_opt_photoviewer-cm-12.1.zip | |
Merge tag 'android-5.1.1_r5' into cm-12.1stable/cm-12.1-YOG7Dcm-12.1
Android 5.1.1 release 5
| -rw-r--r-- | src/com/android/ex/photo/ActionBarInterface.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/ex/photo/ActionBarInterface.java b/src/com/android/ex/photo/ActionBarInterface.java index ee56528..b292b2b 100644 --- a/src/com/android/ex/photo/ActionBarInterface.java +++ b/src/com/android/ex/photo/ActionBarInterface.java @@ -1,6 +1,7 @@ package com.android.ex.photo; import android.graphics.drawable.Drawable; +import android.support.annotation.Nullable; /** @@ -31,15 +32,16 @@ public interface ActionBarInterface { */ public void setDisplayOptionsShowTitle(); + @Nullable public CharSequence getTitle(); - public void setTitle(CharSequence title); + public void setTitle(@Nullable CharSequence title); - public void setSubtitle(CharSequence subtitle); + public void setSubtitle(@Nullable CharSequence subtitle); public void show(); public void hide(); - public void setLogo(Drawable logo); + public void setLogo(@Nullable Drawable logo); } |