Update Vision Glass UI

Set the phone UI theme and style the UI elements. No changes in functionality.
Igalia · Feb 28, 2024 · 21277a7 · 21277a7
1 parent 36189fd
commit 21277a7
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 146 deletions.
diff --git a/app/src/main/res/layout/visionglass_layout.xml b/app/src/main/res/layout/visionglass_layout.xml
diff --git a/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java b/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java
@@ -12,31 +12,29 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.hardware.display.DisplayManager;
 import android.opengl.GLSurfaceView;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Display;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowInsetsController;
 import android.view.WindowManager;
-import android.widget.ImageButton;
+import android.widget.Button;
 import android.widget.SeekBar;
-import android.widget.ToggleButton;
 
 import androidx.activity.ComponentActivity;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
 
+import com.google.android.material.button.MaterialButton;
 import com.huawei.usblib.DisplayMode;
 import com.huawei.usblib.DisplayModeCallback;
 import com.huawei.usblib.OnConnectionListener;
@@ -168,6 +166,8 @@ public void onConnectionChange(boolean b) {
     }
 
     private void initVisionGlassPhoneUI() {
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        setTheme(R.style.Theme_WolvicPhone);
         setContentView(R.layout.visionglass_layout);
 
         mVoiceSearchButton = findViewById(R.id.phoneUIVoiceButton);
@@ -193,13 +193,11 @@ private void initVisionGlassPhoneUI() {
                     // user and system activated clicks (e.g. a11y) will work.
                     view.performClick();
                     break;
-                default:
-                    return false;
             }
-            return true;
+            return false;
         });
 
-        ImageButton backButton = findViewById(R.id.back_button);
+        Button backButton = findViewById(R.id.back_button);
         backButton.setOnClickListener(v -> onBackPressed());
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -454,12 +452,12 @@ public void onVideoAvailabilityChange() {
             media.addMediaListener(new WMediaSession.Delegate() {
                 @Override
                 public void onPlay(@NonNull WSession session, @NonNull WMediaSession mediaSession) {
-                    ((ImageButton) findViewById(R.id.phoneUIPlayButton)).setImageResource(R.drawable.ic_icon_media_pause);
+                    ((MaterialButton) findViewById(R.id.phoneUIPlayButton)).setIconResource(R.drawable.ic_icon_media_pause);
                 }
 
                 @Override
                 public void onPause(@NonNull WSession session, @NonNull WMediaSession mediaSession) {
-                    ((ImageButton) findViewById(R.id.phoneUIPlayButton)).setImageResource(R.drawable.ic_icon_media_play);
+                    ((MaterialButton) findViewById(R.id.phoneUIPlayButton)).setIconResource(R.drawable.ic_icon_media_play);
                 }
 
                 @Override
@@ -481,7 +479,7 @@ private void setupPhoneUI() {
                 mDelegate.getWindows().getFocusedWindow().loadHome();
             });
 
-            ToggleButton headlockButton = findViewById(R.id.headlock_toggle_button);
+            MaterialButton headlockButton = findViewById(R.id.headlock_toggle_button);
             headlockButton.setOnClickListener(v -> {
                 mDelegate.setHeadLockEnabled(headlockButton.isChecked());
             });
@@ -522,7 +520,7 @@ private void setupPhoneUI() {
                 if (media == null)
                     return;
                 media.setMuted(!media.isMuted());
-                ((ImageButton) findViewById(R.id.phoneUIMuteButton)).setImageResource(!media.isMuted() ? R.drawable.ic_icon_media_volume : R.drawable.ic_icon_media_volume_muted);
+                ((MaterialButton) findViewById(R.id.phoneUIMuteButton)).setIconResource(!media.isMuted() ? R.drawable.ic_icon_media_volume : R.drawable.ic_icon_media_volume_muted);
             });
 
             mMediaSeekbar = findViewById(R.id.phoneUIMediaSeekBar);

diff --git a/app/src/visionglass/res/color/bg_button_checkable.xml b/app/src/visionglass/res/color/bg_button_checkable.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/azure" android:state_checked="true" />
+    <item android:color="@color/ocean" />
+</selector>
diff --git a/app/src/visionglass/res/drawable/ff_logo_icon_48.xml b/app/src/visionglass/res/drawable/ff_logo_icon_48.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="48dp"
+        android:height="48dp"
+        android:drawable="@drawable/ff_logo"
+        android:gravity="fill" />
+</layer-list>
diff --git a/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml b/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/azure">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+    <item>
+        <selector>
+            <item
+                android:drawable="@color/silver"
+                android:state_pressed="true" />
+            <item android:drawable="@color/silver" />
+        </selector>
+    </item>
+</ripple>