diff options
| author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-07-15 14:09:32 -0400 |
|---|---|---|
| committer | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-07-21 10:25:54 -0400 |
| commit | e8bb6afcfb0aa7e51a5227e76771a19204bfe6e7 (patch) | |
| tree | 8325c48c99afe69e6e73ba8cc363a29ec5965c6c | |
| parent | 814884abe592a24e947728fdd923840eca317264 (diff) | |
| download | cloud-e8bb6afcfb0aa7e51a5227e76771a19204bfe6e7.tar.gz | |
Add the Google Logo to the sign out dialog of Google login in Android Studio.
Change-Id: I2189e32890ad0bbe7707b98c674de25764f81e0a
| -rw-r--r-- | login/resources/icons/googleFavicon.png | bin | 0 -> 422 bytes | |||
| -rw-r--r-- | login/resources/icons/googleFavicon@2x.png | bin | 0 -> 659 bytes | |||
| -rw-r--r-- | login/src/com/google/gct/login/GoogleLogin.java | 6 |
3 files changed, 5 insertions, 1 deletions
diff --git a/login/resources/icons/googleFavicon.png b/login/resources/icons/googleFavicon.png Binary files differnew file mode 100644 index 0000000..e9c3aba --- /dev/null +++ b/login/resources/icons/googleFavicon.png diff --git a/login/resources/icons/googleFavicon@2x.png b/login/resources/icons/googleFavicon@2x.png Binary files differnew file mode 100644 index 0000000..59cdbf9 --- /dev/null +++ b/login/resources/icons/googleFavicon@2x.png diff --git a/login/src/com/google/gct/login/GoogleLogin.java b/login/src/com/google/gct/login/GoogleLogin.java index 10d4a89..f0c1218 100644 --- a/login/src/com/google/gct/login/GoogleLogin.java +++ b/login/src/com/google/gct/login/GoogleLogin.java @@ -40,10 +40,12 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.IconLoader; import net.jcip.annotations.Immutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.Icon; import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; @@ -514,6 +516,7 @@ public class GoogleLogin { */ private class AndroidUiFacade implements UiFacade { private GoogleLoginActionButton myButton; + private final static String GOOGLE_IMG = "/icons/googleFavicon@2x.png"; @Override public String obtainVerificationCodeFromUserInteraction(String title, GoogleAuthorizationCodeRequestUrl authCodeRequestUrl) { @@ -564,7 +567,8 @@ public class GoogleLogin { @Override public boolean askYesOrNo(String title, String message) { - return (Messages.showYesNoDialog(message, title, Messages.getQuestionIcon()) == Messages.YES); + Icon icon = IconLoader.getIcon(GOOGLE_IMG); + return (Messages.showYesNoDialog(message, title, icon) == Messages.YES); } @Override |
