Scrub from home (PRD AD-10) - New setting, off by default: a vertical slide along the alphabet's edge of the home screen opens the drawer and scrubs it in the same touch (FlexeraEdgeScrubController). It claims a touch only once it has clearly moved up or down, and never during an item drag. Nothing is drawn on the home screen. Work profile (PRD AD-14) - The Personal and Work tabs and the work info card were one icon wide, because their width came from grid maths that assumes several columns. In the one-column list they now line up with the search bar. - The info card's own scroller section no longer shows up as a letter in the alphabet. Navigation modes (PRD SI-2, AD-17) - With three-button navigation, the controller that carries swipe up and hold stood aside completely, so a hold did nothing there. It now takes the ordinary swipe up from the home screen in that mode too. Wave alphabet - The list darkens under the wave where the letters cross icons and names: always from the left edge, and from the right edge in proportion to how far the wave reaches in. Release script - -BuildOnly builds and checks the APK without publishing, so a version can be tried first and then published with -SkipBuild. Checked on the Android 17 emulator (debug build): work tabs at full width, scrub from the home screen's edge, the search field keeping its background while typing. The three-button change and the right-edge darkening were written after that build and are not yet checked. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
143 lines
5.4 KiB
Java
143 lines
5.4 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.workprofile;
|
|
|
|
import android.content.Context;
|
|
import android.content.res.TypedArray;
|
|
import android.graphics.drawable.RippleDrawable;
|
|
import android.graphics.drawable.StateListDrawable;
|
|
import android.util.AttributeSet;
|
|
import android.widget.Button;
|
|
import android.widget.LinearLayout;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
|
|
import com.android.launcher3.DeviceProfile;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.pageindicators.PageIndicator;
|
|
import com.android.launcher3.views.ActivityContext;
|
|
|
|
import app.lawnchair.font.FontManager;
|
|
import app.lawnchair.theme.color.tokens.ColorStateListTokens;
|
|
import app.lawnchair.theme.drawable.DrawableTokens;
|
|
|
|
/**
|
|
* Supports two indicator colors, dedicated for personal and work tabs.
|
|
*/
|
|
public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageIndicator {
|
|
private final boolean mIsAlignOnIcon;
|
|
private OnActivePageChangedListener mOnActivePageChangedListener;
|
|
private int mLastActivePage = 0;
|
|
|
|
public PersonalWorkSlidingTabStrip(@NonNull Context context, @Nullable AttributeSet attrs) {
|
|
super(context, attrs);
|
|
TypedArray typedArray = context.obtainStyledAttributes(attrs,
|
|
R.styleable.PersonalWorkSlidingTabStrip);
|
|
mIsAlignOnIcon = typedArray.getBoolean(
|
|
R.styleable.PersonalWorkSlidingTabStrip_alignOnIcon, false);
|
|
typedArray.recycle();
|
|
}
|
|
|
|
// Lawnchair: This function theme the work mode tab and toggle
|
|
@Override
|
|
protected void onFinishInflate() {
|
|
super.onFinishInflate();
|
|
|
|
FontManager fontManager = FontManager.INSTANCE.get(getContext());
|
|
for (int i = 0; i < getChildCount(); i++) {
|
|
Button tab = (Button) getChildAt(i);
|
|
tab.setAllCaps(false);
|
|
// Lawnchair-TODO: StateListDrawable
|
|
// RippleDrawable background = (RippleDrawable) tab.getBackground();
|
|
// background.setDrawableByLayerId(android.R.id.mask, DrawableTokens.AllAppsTabsMaskDrawable.resolve(getContext()));
|
|
tab.setBackground(DrawableTokens.AllAppsTabsBackground.resolve(getContext()));
|
|
tab.setTextColor(ColorStateListTokens.AllAppsTabText.resolve(getContext()));
|
|
fontManager.setCustomFont(tab, R.id.font_body_medium);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Highlights tab with index pos
|
|
*/
|
|
public void updateTabTextColor(int pos) {
|
|
for (int i = 0; i < getChildCount(); i++) {
|
|
Button tab = (Button) getChildAt(i);
|
|
tab.setSelected(i == pos);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void setScroll(int currentScroll, int totalScroll) {}
|
|
|
|
@Override
|
|
public void setActiveMarker(int activePage) {
|
|
updateTabTextColor(activePage);
|
|
if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
|
|
mOnActivePageChangedListener.onActivePageChanged(activePage);
|
|
}
|
|
mLastActivePage = activePage;
|
|
}
|
|
|
|
public void setOnActivePageChangedListener(OnActivePageChangedListener listener) {
|
|
mOnActivePageChangedListener = listener;
|
|
}
|
|
|
|
@Override
|
|
public void setMarkersCount(int numMarkers) {
|
|
}
|
|
|
|
@Override
|
|
public boolean hasOverlappingRendering() {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
|
if (mIsAlignOnIcon) {
|
|
// If any padding is not specified, restrict the width to emulate padding
|
|
int size = MeasureSpec.getSize(widthMeasureSpec);
|
|
size = getTabWidth(getContext(), size);
|
|
widthMeasureSpec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
|
|
}
|
|
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
|
}
|
|
|
|
/**
|
|
* Returns distance between left and right app icons
|
|
*/
|
|
public static int getTabWidth(Context context, int totalWidth) {
|
|
DeviceProfile grid = ActivityContext.lookupContext(context).getDeviceProfile();
|
|
// Flexera Launcher: the one-column drawer list has no left and right icon to span. The
|
|
// grid maths below would make the tabs and the work info card one icon wide, so line
|
|
// them up with the search bar instead.
|
|
if (grid.numShownAllAppsColumns == app.flexera.drawer.FlexeraDrawer.COLUMNS) {
|
|
return totalWidth - 2 * app.flexera.drawer.FlexeraDrawer.rowStartPadding(context);
|
|
}
|
|
int iconPadding = totalWidth / grid.numShownAllAppsColumns
|
|
- grid.getAllAppsProfile().getIconSizePx();
|
|
return totalWidth - iconPadding;
|
|
}
|
|
|
|
/**
|
|
* Interface definition for a callback to be invoked when an active page has been changed.
|
|
*/
|
|
public interface OnActivePageChangedListener {
|
|
/** Called when the active page has been changed. */
|
|
void onActivePageChanged(int currentActivePage);
|
|
}
|
|
}
|