plugins: Rename plugins and lib

PixelOS-and-Not-So-Pixel · Jun 15, 2020 · 44614f2 · 44614f2
1 parent 8e6e10f
commit 44614f2
Show file tree

Hide file tree

Showing 83 changed files with 64 additions and 64 deletions.
diff --git a/AospPanel/Android.bp b/AospPanel/Android.bp
@@ -3,7 +3,7 @@ android_app {
     name: "AospPanel",
 
     static_libs: [
-        "ResMini",
+        "VolumePluginCommon",
     ],
 
     resource_dirs: ["res"],

diff --git a/AospPanel/res/layout/volume_dialog_aosp.xml b/AospPanel/res/layout/volume_dialog_aosp.xml
@@ -46,7 +46,7 @@
             android:translationZ="@dimen/volume_dialog_elevation"
             android:clipToPadding="false"
             android:background="@drawable/rounded_bg_full">
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                 android:id="@+id/ringer_icon"
                 style="@style/VolumeButtons"
                 android:background="@drawable/rounded_ripple"
@@ -94,7 +94,7 @@
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
                 android:background="@drawable/rounded_bg_bottom_background">
-                <co.potatoproject.systemui.resmini.ExpandableIndicator
+                <co.potatoproject.plugin.volume.common.ExpandableIndicator
                     android:id="@+id/expandable_indicator"
                     android:layout_width="@dimen/volume_dialog_tap_target_size"
                     android:layout_height="@dimen/volume_dialog_tap_target_size"
@@ -111,7 +111,7 @@
                     android:padding="16dp"
                     android:rotation="90" />
 
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/media_output"
                     android:src="@drawable/ic_bluetooth_audio"
                     android:layout_width="@dimen/volume_dialog_tap_target_size"
@@ -138,7 +138,7 @@
             android:clipToPadding="false"
             android:translationZ="@dimen/volume_dialog_elevation"
             android:background="@drawable/rounded_bg_full">
-            <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+            <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                 android:id="@+id/odi_captions_icon"
                 android:src="@drawable/ic_volume_odi_captions_disabled"
                 style="@style/VolumeButtons"

diff --git a/AospPanel/res/layout/volume_dialog_aosp_row.xml b/AospPanel/res/layout/volume_dialog_aosp_row.xml
@@ -55,7 +55,7 @@
                 android:rotation="-90" />
         </FrameLayout>
 
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_tap_target_size"

diff --git a/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java b/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java
@@ -31,7 +31,7 @@
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -94,7 +94,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
 import co.potatoproject.plugin.volume.aosp.R;
 

diff --git a/TogglePanel/Android.bp → CompactPanel/Android.bp b/TogglePanel/Android.bp → CompactPanel/Android.bp
@@ -1,8 +1,8 @@
 android_app {
 
-    name: "TogglePanel",
+    name: "CompactPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 

diff --git a/TogglePanel/AndroidManifest.xml → CompactPanel/AndroidManifest.xml b/TogglePanel/AndroidManifest.xml → CompactPanel/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="co.potatoproject.plugin.volume.toggle">
+    package="co.potatoproject.plugin.volume.compact">
 
     <uses-permission android:name="com.android.systemui.permission.PLUGIN" />
 
@@ -32,7 +32,7 @@
 
         <provider
             android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
-            android:authorities="co.potatoproject.plugin.volume.toggle"
+            android:authorities="co.potatoproject.plugin.volume.compact"
             tools:replace="android:authorities"
             android:exported="false"
             android:multiprocess="true" />

diff --git a/...Panel/res/drawable/ic_bluetooth_audio.xml → ...Panel/res/drawable/ic_bluetooth_audio.xml b/...Panel/res/drawable/ic_bluetooth_audio.xml → ...Panel/res/drawable/ic_bluetooth_audio.xml
diff --git a/FancyPanel/res/drawable/ic_tune_black.xml → CompactPanel/res/drawable/ic_tune_black.xml b/FancyPanel/res/drawable/ic_tune_black.xml → CompactPanel/res/drawable/ic_tune_black.xml
diff --git a/.../drawable/seekbar_thumb_material_anim.xml → .../drawable/seekbar_thumb_material_anim.xml b/.../drawable/seekbar_thumb_material_anim.xml → .../drawable/seekbar_thumb_material_anim.xml
diff --git a/...yPanel/res/layout/volume_dialog_fancy.xml → ...anel/res/layout/volume_dialog_compact.xml b/...yPanel/res/layout/volume_dialog_fancy.xml → ...anel/res/layout/volume_dialog_compact.xml
@@ -104,7 +104,7 @@
                     android:layout_width="@dimen/volume_dialog_caption_size"
                     android:layout_height="@dimen/volume_dialog_caption_size"
                     android:clipToPadding="false">
-                    <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+                    <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                         android:id="@+id/odi_captions_icon"
                         android:src="@drawable/ic_volume_odi_captions_disabled"
                         style="@style/VolumeButtons"
@@ -122,7 +122,7 @@
                     android:layout_width="@dimen/volume_dialog_caption_size"
                     android:layout_height="@dimen/volume_dialog_caption_size"
                     android:clipToPadding="false">
-                    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                         android:id="@+id/media_output"
                         android:src="@drawable/ic_bluetooth_audio"
                         android:layout_width="match_parent"
@@ -148,7 +148,7 @@
                     android:layout_width="@dimen/volume_dialog_ringer_size"
                     android:layout_height="@dimen/volume_dialog_ringer_size"
                     android:background="@drawable/rounded_bg_full">
-                    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                         android:id="@+id/ringer_icon"
                         style="@style/VolumeButtons"
                         android:background="@drawable/rounded_ripple"
@@ -170,7 +170,7 @@
                     android:id="@+id/expandable_indicator_container"
                     android:layout_width="@dimen/volume_dialog_ringer_size"
                     android:layout_height="@dimen/volume_dialog_ringer_size">
-                    <co.potatoproject.systemui.resmini.ExpandableIndicator
+                    <co.potatoproject.plugin.volume.common.ExpandableIndicator
                         android:id="@+id/expandable_indicator"
                         android:layout_width="@dimen/volume_dialog_tap_target_size"
                         android:layout_height="@dimen/volume_dialog_tap_target_size"

diff --git a/...el/res/layout/volume_dialog_fancy_row.xml → .../res/layout/volume_dialog_compact_row.xml b/...el/res/layout/volume_dialog_fancy_row.xml → .../res/layout/volume_dialog_compact_row.xml
@@ -29,7 +29,7 @@
         android:layout_gravity="center"
         android:orientation="vertical"
         android:animateLayoutChanges="true" >
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_panel_mini_width"

diff --git a/FancyPanel/res/values/dimens.xml → CompactPanel/res/values/dimens.xml b/FancyPanel/res/values/dimens.xml → CompactPanel/res/values/dimens.xml
diff --git a/TogglePanel/res/values/strings.xml → CompactPanel/res/values/strings.xml b/TogglePanel/res/values/strings.xml → CompactPanel/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="plugin_label">Toggle panel</string>
+    <string name="plugin_label">Compact panel</string>
 </resources>
diff --git a/...plugin/volume/fancy/VolumeDialogImpl.java → ...ugin/volume/compact/VolumeDialogImpl.java b/...plugin/volume/fancy/VolumeDialogImpl.java → ...ugin/volume/compact/VolumeDialogImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.plugin.volume.fancy;
+package co.potatoproject.plugin.volume.compact;
 
 import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
 import static android.media.AudioManager.RINGER_MODE_NORMAL;
@@ -30,7 +30,7 @@
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -94,9 +94,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
-import co.potatoproject.plugin.volume.fancy.R;
+import co.potatoproject.plugin.volume.compact.R;
 
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.PluginDependency;
@@ -240,7 +240,7 @@ private void initDialog() {
         mWindowParams.type = WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
         mWindowParams.format = PixelFormat.TRANSLUCENT;
         mWindowParams.windowAnimations = -1;
-        mDialog = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_fancy,
+        mDialog = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_compact,
                         (ViewGroup) null, false);
 
         mDialog.setOnTouchListener((v, event) -> {
@@ -495,7 +495,7 @@ private void initRow(final VolumeRow row, final int stream, int iconRes, int ico
         row.iconMuteRes = iconMuteRes;
         row.important = important;
         row.defaultStream = defaultStream;
-        row.view = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_fancy_row, null);
+        row.view = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_compact_row, null);
         row.view.setId(row.stream);
         row.view.setTag(row);
         row.header = row.view.findViewById(R.id.volume_row_header);

diff --git a/OreoPanel/Android.bp b/OreoPanel/Android.bp
@@ -2,7 +2,7 @@ android_app {
 
     name: "OreoPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 

diff --git a/OreoPanel/res/layout/volume_dialog_oreo.xml b/OreoPanel/res/layout/volume_dialog_oreo.xml
@@ -52,7 +52,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Volume.Header" />
-        <co.potatoproject.systemui.resmini.ExpandableIndicator
+        <co.potatoproject.plugin.volume.common.ExpandableIndicator
             android:id="@+id/volume_expand_button"
             android:layout_width="@dimen/volume_button_size"
             android:layout_height="@dimen/volume_button_size"

diff --git a/OreoPanel/res/layout/volume_dialog_oreo_row.xml b/OreoPanel/res/layout/volume_dialog_oreo_row.xml
@@ -33,7 +33,7 @@
             android:layout_height="@dimen/volume_oreo_row_slider_height"
             android:orientation="horizontal"
             android:paddingStart="@dimen/volume_row_padding_start" >
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                 android:id="@+id/volume_row_icon"
                 style="@style/VolumeButtons"
                 android:layout_width="@dimen/volume_button_size"

diff --git a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java
@@ -73,7 +73,7 @@
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
 import co.potatoproject.plugin.volume.oreo.R;
 

diff --git a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java
@@ -32,8 +32,8 @@
 import android.view.ViewGroup;
 import android.view.animation.PathInterpolator;
 
-import co.potatoproject.systemui.resmini.D;
-import co.potatoproject.systemui.resmini.Utils;
+import co.potatoproject.plugin.volume.common.D;
+import co.potatoproject.plugin.volume.common.Utils;
 
 public class VolumeDialogMotion {
     private static final String TAG = Utils.logTag(VolumeDialogMotion.class);

diff --git a/FancyPanel/Android.bp → TiledPanel/Android.bp b/FancyPanel/Android.bp → TiledPanel/Android.bp
@@ -1,8 +1,8 @@
 android_app {
 
-    name: "FancyPanel",
+    name: "TiledPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 

diff --git a/FancyPanel/AndroidManifest.xml → TiledPanel/AndroidManifest.xml b/FancyPanel/AndroidManifest.xml → TiledPanel/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="co.potatoproject.plugin.volume.fancy">
+    package="co.potatoproject.plugin.volume.tiled">
 
     <uses-permission android:name="com.android.systemui.permission.PLUGIN" />
 
@@ -32,7 +32,7 @@
 
         <provider
             android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
-            android:authorities="co.potatoproject.plugin.volume.fancy"
+            android:authorities="co.potatoproject.plugin.volume.tiled"
             tools:replace="android:authorities"
             android:exported="false"
             android:multiprocess="true" />

diff --git a/...lePanel/res/drawable/ic_output_switch.xml → TiledPanel/res/drawable/ic_output_switch.xml b/...lePanel/res/drawable/ic_output_switch.xml → TiledPanel/res/drawable/ic_output_switch.xml
diff --git a/TogglePanel/res/drawable/rounded_ripple.xml → TiledPanel/res/drawable/rounded_ripple.xml b/TogglePanel/res/drawable/rounded_ripple.xml → TiledPanel/res/drawable/rounded_ripple.xml
diff --git a/.../res/drawable/rounded_ripple_selected.xml → .../res/drawable/rounded_ripple_selected.xml b/.../res/drawable/rounded_ripple_selected.xml → .../res/drawable/rounded_ripple_selected.xml
diff --git a/...Panel/res/layout/volume_dialog_toggle.xml → ...dPanel/res/layout/volume_dialog_tiled.xml b/...Panel/res/layout/volume_dialog_toggle.xml → ...dPanel/res/layout/volume_dialog_tiled.xml
@@ -56,7 +56,7 @@
                 android:layout_marginLeft="@dimen/volume_dialog_spacer"
                 android:layout_marginRight="@dimen/volume_dialog_spacer"
                 android:background="@drawable/rounded_bg_full">
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/os_icon"
                     style="@style/VolumeButtons"
                     android:background="@drawable/rounded_ripple"
@@ -78,7 +78,7 @@
                 android:translationZ="@dimen/volume_dialog_elevation"
                 android:clipToPadding="false"
                 android:background="@drawable/rounded_bg_full">
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/ringer_icon"
                     style="@style/VolumeButtons"
                     android:background="@drawable/rounded_ripple"
@@ -163,7 +163,7 @@
             android:clipToPadding="false"
             android:translationZ="@dimen/volume_dialog_elevation"
             android:background="@drawable/rounded_bg_full">
-            <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+            <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                 android:id="@+id/odi_captions_icon"
                 android:src="@drawable/ic_volume_odi_captions_disabled"
                 style="@style/VolumeButtons"

diff --git a/...l/res/layout/volume_dialog_toggle_row.xml → ...el/res/layout/volume_dialog_tiled_row.xml b/...l/res/layout/volume_dialog_toggle_row.xml → ...el/res/layout/volume_dialog_tiled_row.xml
@@ -55,7 +55,7 @@
                 android:rotation="-90" />
         </FrameLayout>
 
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_tap_target_size"

diff --git a/...ut/volume_dialog_toggle_stream_button.xml → ...out/volume_dialog_tiled_stream_button.xml b/...ut/volume_dialog_toggle_stream_button.xml → ...out/volume_dialog_tiled_stream_button.xml
@@ -22,7 +22,7 @@
     android:clipToPadding="false"
     android:theme="@style/qs_theme">
 
-    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
         android:id="@+id/button"
         style="@style/VolumeButtons"
         android:layout_width="@dimen/volume_dialog_ringer_size"

diff --git a/TogglePanel/res/values/dimens.xml → TiledPanel/res/values/dimens.xml b/TogglePanel/res/values/dimens.xml → TiledPanel/res/values/dimens.xml
diff --git a/FancyPanel/res/values/strings.xml → TiledPanel/res/values/strings.xml b/FancyPanel/res/values/strings.xml → TiledPanel/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="plugin_label">Fancy panel</string>
+    <string name="plugin_label">Tiled panel</string>
 </resources>
diff --git a/...lugin/volume/toggle/VolumeDialogImpl.java → ...plugin/volume/tiled/VolumeDialogImpl.java b/...lugin/volume/toggle/VolumeDialogImpl.java → ...plugin/volume/tiled/VolumeDialogImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.plugin.volume.toggle;
+package co.potatoproject.plugin.volume.tiled;
 
 import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
 import static android.media.AudioManager.RINGER_MODE_NORMAL;
@@ -31,7 +31,7 @@
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -93,9 +93,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
-import co.potatoproject.plugin.volume.toggle.R;
+import co.potatoproject.plugin.volume.tiled.R;
 
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.PluginDependency;
@@ -249,7 +249,7 @@ private void initDialog() {
         mWindow.setAttributes(lp);
         mWindow.setLayout(WRAP_CONTENT, WRAP_CONTENT);
 
-        mDialog.setContentView(R.layout.volume_dialog_toggle);
+        mDialog.setContentView(R.layout.volume_dialog_tiled);
         mDialogView = mDialog.findViewById(R.id.volume_dialog);
         mDialogView.setAlpha(0);
         mDialog.setCanceledOnTouchOutside(true);
@@ -516,7 +516,7 @@ private void initRow(final VolumeRow row, final int stream, int iconRes, int ico
         row.iconMuteRes = iconMuteRes;
         row.important = important;
         row.defaultStream = defaultStream;
-        row.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_toggle_row, null);
+        row.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_tiled_row, null);
         row.view.setId(row.stream);
         row.view.setTag(row);
         row.header = row.view.findViewById(R.id.volume_row_header);
@@ -607,7 +607,7 @@ private void initStreamButton(final StreamSwitchButton button, final VolumeRow r
         button.iconRes = iconRes;
         button.iconMuteRes = iconMuteRes;
 
-        button.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_toggle_stream_button, null);
+        button.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_tiled_stream_button, null);
         button.view.setId(stream);
         button.view.setTag(button);
 

diff --git a/ResMini/Android.bp → VolumePluginCommon/Android.bp b/ResMini/Android.bp → VolumePluginCommon/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "ResMini",
+    name: "VolumePluginCommon",
     static_libs: [
         "SystemUIPluginLib",
         "androidx.appcompat_appcompat",