commit e0810d0d46280ea055dc7f5f75785fa39c3876d5
author Santiago Etchebehere <santie@google.com> Thu May 10 17:39:40 2018 -0700
committer Santiago Etchebehere <santie@google.com> Fri May 11 16:27:26 2018 -0700
tree c0d887dd208259ea1aaad86ec554dbf2cc616b39
parent 17b1b25265cc2994c8b6c107b0a5dde6bae7ba33

Add Context argument to getAction methods

Add a Context argument to methods for getting title and
icon for the action link, to support cases where we're
obtaining these from resources.

Bug: 77695473

Change-Id: I3e8b1d47afa46ab98d82f29ee0b19148362e249a

src/com/android/wallpaper/module/DefaultWallpaperPersister.java

diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
index 5d371a3..1c9c0ba 100755
--- a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
+++ b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
@@ -1001,8 +1001,10 @@
                     mWallpaper.getAttributions(mAppContext));
             mWallpaperPreferences.setHomeWallpaperBaseImageUrl(mWallpaper.getBaseImageUrl());
             mWallpaperPreferences.setHomeWallpaperActionUrl(mWallpaper.getActionUrl(mAppContext));
-            mWallpaperPreferences.setHomeWallpaperActionLabelRes(mWallpaper.getActionLabelRes());
-            mWallpaperPreferences.setHomeWallpaperActionIconRes(mWallpaper.getActionIconRes());
+            mWallpaperPreferences.setHomeWallpaperActionLabelRes(
+                    mWallpaper.getActionLabelRes(mAppContext));
+            mWallpaperPreferences.setHomeWallpaperActionIconRes(
+                    mWallpaper.getActionIconRes(mAppContext));
             mWallpaperPreferences.setHomeWallpaperCollectionId(
                     mWallpaper.getCollectionId(mAppContext));
             mWallpaperPreferences.setHomeWallpaperRemoteId(mWallpaper.getWallpaperId());
@@ -1013,8 +1015,10 @@
             mWallpaperPreferences.setLockWallpaperAttributions(
                     mWallpaper.getAttributions(mAppContext));
             mWallpaperPreferences.setLockWallpaperActionUrl(mWallpaper.getActionUrl(mAppContext));
-            mWallpaperPreferences.setHomeWallpaperActionLabelRes(mWallpaper.getActionLabelRes());
-            mWallpaperPreferences.setHomeWallpaperActionIconRes(mWallpaper.getActionIconRes());
+            mWallpaperPreferences.setHomeWallpaperActionLabelRes(
+                    mWallpaper.getActionLabelRes(mAppContext));
+            mWallpaperPreferences.setHomeWallpaperActionIconRes(
+                    mWallpaper.getActionIconRes(mAppContext));
             mWallpaperPreferences.setLockWallpaperCollectionId(
                     mWallpaper.getCollectionId(mAppContext));