Trebuchet: fix protected apps behaviour

If no secure lockscreen is set we should not show
the app list

Also make icons' touchable area larger

Change-Id: Id398e98cb4d8fdae169aae194211b98e6441b4cf
Signed-off-by: Joey <joey@lineageos.org>

2 files changed, 13 insertions, 5 deletions

diff --git a/res/layout/item_hidden_app.xml b/res/layout/item_hidden_app.xml
index 34fad9831..d40f04e27 100644
--- a/res/layout/item_hidden_app.xml
+++ b/res/layout/item_hidden_app.xml
@@ -26,21 +26,25 @@
 
     <ImageView
         android:id="@+id/item_protected_app_switch"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="56dp"
+        android:padding="8dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true" />
 
     <ImageView
         android:id="@+id/item_hidden_app_switch"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="16dp"
+        android:padding="8dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true" />
 
diff --git a/src/com/android/launcher3/lineage/LineageUtils.java b/src/com/android/launcher3/lineage/LineageUtils.java
index 6c30d3414..d328dd896 100644
--- a/src/com/android/launcher3/lineage/LineageUtils.java
+++ b/src/com/android/launcher3/lineage/LineageUtils.java
@@ -8,6 +8,9 @@ import android.hardware.biometrics.BiometricPrompt;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.Looper;
+import android.widget.Toast;
+
+import com.android.launcher3.R;
 
 public class LineageUtils {
 
@@ -52,7 +55,8 @@ public class LineageUtils {
                     runnable -> handler.post(runnable),
                     authenticationCallback);
         } else {
-            successRunnable.run();
+            Toast.makeText(context, R.string.trust_apps_no_lock_error, Toast.LENGTH_LONG)
+                .show();
         }
     }