diff --git a/quickstep/res/drawable/taskbar_divider_bg.xml b/quickstep/res/drawable/taskbar_divider_button.xml similarity index 57% rename from quickstep/res/drawable/taskbar_divider_bg.xml rename to quickstep/res/drawable/taskbar_divider_button.xml index 52e230dadd..cb116cfece 100644 --- a/quickstep/res/drawable/taskbar_divider_bg.xml +++ b/quickstep/res/drawable/taskbar_divider_button.xml @@ -13,8 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout/taskbar_divider.xml b/quickstep/res/layout/taskbar_divider.xml index 73f3811ecf..0a92fa92db 100644 --- a/quickstep/res/layout/taskbar_divider.xml +++ b/quickstep/res/layout/taskbar_divider.xml @@ -13,16 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - \ No newline at end of file + android:backgroundTint="@android:color/transparent" /> \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index 074cbe116e..cc091a84d1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -88,7 +88,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar private @Nullable IconButtonView mAllAppsButton; // Only non-null when device supports having an All Apps button. - private @Nullable View mTaskbarDivider; + private @Nullable IconButtonView mTaskbarDivider; private View mQsb; @@ -158,8 +158,12 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar mActivityContext.getColor(R.color.all_apps_button_color)); if (FeatureFlags.ENABLE_TASKBAR_PINNING.get()) { - mTaskbarDivider = LayoutInflater.from(context).inflate(R.layout.taskbar_divider, + mTaskbarDivider = (IconButtonView) LayoutInflater.from(context).inflate( + R.layout.taskbar_divider, this, false); + mTaskbarDivider.setIconDrawable( + resources.getDrawable(R.drawable.taskbar_divider_button)); + mTaskbarDivider.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); } }