Merge "Convert Personal/Work tabs to rounded bubbles" into tm-dev (5e35dcd3) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -2507,11 +2507,6 @@ public class ChooserActivity extends ResolverActivity implements
		offset += findViewById(R.id.tabs).getHeight();
		}

		View tabDivider = findViewById(R.id.resolver_tab_divider);
		if (tabDivider.getVisibility() == View.VISIBLE) {
		offset += tabDivider.getHeight();
		}

		if (recyclerView.getVisibility() == View.VISIBLE) {
		int directShareHeight = 0;
		rowsToShow = Math.min(4, rowsToShow);
		@@ -2700,7 +2695,7 @@ public class ChooserActivity extends ResolverActivity implements
		if (mResolverDrawerLayout == null) {
		return;
		}
		int elevatedViewResId = shouldShowTabs() ? R.id.resolver_tab_divider : R.id.chooser_header;
		int elevatedViewResId = shouldShowTabs() ? R.id.tabs : R.id.chooser_header;
		final View elevatedView = mResolverDrawerLayout.findViewById(elevatedViewResId);
		final float defaultElevation = elevatedView.getElevation();
		final float chooserHeaderScrollElevation =

core/java/com/android/internal/app/ResolverActivity.java

+18 −25

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ import android.stats.devicepolicy.DevicePolicyEnums;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.Slog;
		import android.util.TypedValue;
		import android.view.Gravity;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -1711,23 +1710,32 @@ public class ResolverActivity extends Activity implements
		tabHost.setup();
		ViewPager viewPager = findViewById(R.id.profile_pager);
		viewPager.setSaveEnabled(false);

		Button personalButton = (Button) getLayoutInflater().inflate(
		R.layout.resolver_profile_tab_button, tabHost.getTabWidget(), false);
		personalButton.setText(getPersonalTabLabel());
		personalButton.setContentDescription(getPersonalTabAccessibilityLabel());

		TabHost.TabSpec tabSpec = tabHost.newTabSpec(TAB_TAG_PERSONAL)
		.setContent(R.id.profile_pager)
		.setIndicator(getPersonalTabLabel());
		.setIndicator(personalButton);
		tabHost.addTab(tabSpec);

		Button workButton = (Button) getLayoutInflater().inflate(
		R.layout.resolver_profile_tab_button, tabHost.getTabWidget(), false);
		workButton.setText(getWorkTabLabel());
		workButton.setContentDescription(getWorkTabAccessibilityLabel());

		tabSpec = tabHost.newTabSpec(TAB_TAG_WORK)
		.setContent(R.id.profile_pager)
		.setIndicator(getWorkTabLabel());
		.setIndicator(workButton);
		tabHost.addTab(tabSpec);

		TabWidget tabWidget = tabHost.getTabWidget();
		tabWidget.setVisibility(View.VISIBLE);
		resetTabsHeaderStyle(tabWidget);
		updateActiveTabStyle(tabHost);

		tabHost.setOnTabChangedListener(tabId -> {
		resetTabsHeaderStyle(tabWidget);
		updateActiveTabStyle(tabHost);
		if (TAB_TAG_PERSONAL.equals(tabId)) {
		viewPager.setCurrentItem(0);
		@@ -1767,7 +1775,6 @@ public class ResolverActivity extends Activity implements
		workTab.setFocusableInTouchMode(true);
		workTab.requestFocus();
		});
		findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE);
		}

		private String getPersonalTabLabel() {
		@@ -1810,22 +1817,6 @@ public class ResolverActivity extends Activity implements
		}
		}

		private void resetTabsHeaderStyle(TabWidget tabWidget) {
		for (int i = 0; i < tabWidget.getChildCount(); i++) {
		View tabView = tabWidget.getChildAt(i);
		TextView title = tabView.findViewById(android.R.id.title);
		title.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_DialogWindowTitle);
		title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary));
		title.setTextSize(TypedValue.COMPLEX_UNIT_PX,
		getResources().getDimension(R.dimen.resolver_tab_text_size));
		if (title.getText().equals(getPersonalTabLabel())) {
		tabView.setContentDescription(getPersonalTabAccessibilityLabel());
		} else if (title.getText().equals(getWorkTabLabel())) {
		tabView.setContentDescription(getWorkTabAccessibilityLabel());
		}
		}
		}

		private String getPersonalTabAccessibilityLabel() {
		return getSystemService(DevicePolicyManager.class).getResources().getString(
		RESOLVER_PERSONAL_TAB_ACCESSIBILITY,
		@@ -1846,9 +1837,11 @@ public class ResolverActivity extends Activity implements
		}

		private void updateActiveTabStyle(TabHost tabHost) {
		TextView title = tabHost.getTabWidget().getChildAt(tabHost.getCurrentTab())
		.findViewById(android.R.id.title);
		title.setTextColor(getAttrColor(this, android.R.attr.colorAccent));
		int currentTab = tabHost.getCurrentTab();
		TextView selected = (TextView) tabHost.getTabWidget().getChildAt(currentTab);
		TextView unselected = (TextView) tabHost.getTabWidget().getChildAt(1 - currentTab);
		selected.setSelected(true);
		unselected.setSelected(false);
		}

		private void setupViewVisibilities() {

core/res/res/color-night/resolver_accent_ripple.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2022 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.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@android:color/system_accent1_300"/>
		</selector>

core/res/res/color-night/resolver_profile_tab_selected_bg.xml

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2022 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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<item android:color="?androidprv:attr/colorAccentSecondary"/>
		</selector>

core/res/res/color-night/resolver_profile_tab_text.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2022 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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<item android:color="?androidprv:attr/textColorPrimaryInverse" android:state_selected="true"/>
		<item android:color="?androidprv:attr/textColorSecondary"/>
		</selector>