Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

2 files changed, 15 insertions, 10 deletions

diff --git a/src/com/android/camera/data/Camera2ModeAdapter.java b/src/com/android/camera/data/Camera2ModeAdapter.java
index 039180b91..086e9f779 100755..100644
--- a/src/com/android/camera/data/Camera2ModeAdapter.java
+++ b/src/com/android/camera/data/Camera2ModeAdapter.java
@@ -34,18 +34,22 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.TextView;
+
+import com.android.camera.ui.RotateImageView;
+
 import org.codeaurora.snapcam.R;
 
 import java.util.List;
 
 public class Camera2ModeAdapter extends RecyclerView.Adapter<Camera2ModeAdapter.ViewHolder> {
     private List<String> mModeList;
+    private List<Integer> mIcons;
     private int mSelectedPos = 2;
     private OnItemClickListener mOnItemClickListener;
 
-    public Camera2ModeAdapter(List<String> list) {
+    public Camera2ModeAdapter(List<String> list, List<Integer> icons) {
         this.mModeList = list;
+        this.mIcons = icons;
     }
 
     public void setOnItemClickListener(OnItemClickListener listener) {
@@ -62,9 +66,9 @@ public class Camera2ModeAdapter extends RecyclerView.Adapter<Camera2ModeAdapter.
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        holder.mCameraModeText.setText(mModeList.get(position));
-        holder.mCameraModeText.setSelected(mSelectedPos == position);
-        holder.mCameraModeText.setOnClickListener(new View.OnClickListener() {
+        holder.mCameraModeIcon.setSelected(mSelectedPos == position);
+        holder.mCameraModeIcon.setImageResource(mIcons.get(position));
+        holder.mCameraModeIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (mOnItemClickListener.onItemClick(position) >= 0) {
@@ -90,12 +94,11 @@ public class Camera2ModeAdapter extends RecyclerView.Adapter<Camera2ModeAdapter.
     }
 
     class ViewHolder extends RecyclerView.ViewHolder{
-
-        protected TextView mCameraModeText;
+        protected RotateImageView mCameraModeIcon;
 
         public ViewHolder(View itemView) {
             super(itemView);
-            mCameraModeText = (TextView) itemView.findViewById(R.id.mode_text);
+            mCameraModeIcon = itemView.findViewById(R.id.mode_icon);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 8b6b03e54..95c1ea723 100644..100755
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -27,6 +27,7 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 
+import com.android.camera.SDCard;
 import com.android.camera.Storage;
 import com.android.camera.app.PlaceholderManager;
 import com.android.camera.ui.FilmStripView.ImageData;
@@ -279,7 +280,8 @@ public class CameraDataAdapter implements LocalDataAdapter {
     }
 
     private static String[] getCameraPath() {
-        String[] cameraPath = { Storage.DIRECTORY + "/%" };
+        String[] cameraPath =
+                {Storage.DIRECTORY + "/%", SDCard.instance().getDirectory() + "/%"};
         return cameraPath;
     }