PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 7947231 from 17423d1682 to sc-v2-release

Browse Source 
Change-Id: Iea10f5083539917d27d4f495cebf35408c13a36a
This commit is contained in:
Android Build Coastguard Worker
2021-11-26 00:09:35 +00:00
parent f49d954901 17423d1682
commit 85a0f49162
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/bubble_preference.xml
View File

@@ -55,7 +55,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="3"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:layout_toEndOf="@id/bubble_all_icon" android:layout_toEndOf="@id/bubble_all_icon"
@@ -87,7 +87,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="3"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:layout_toEndOf="@id/bubble_selected_icon" android:layout_toEndOf="@id/bubble_selected_icon"
@@ -119,7 +119,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="3"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:layout_toEndOf="@id/bubble_none_icon" android:layout_toEndOf="@id/bubble_none_icon"

12
src/com/android/settings/accounts/AvatarViewMixin.java
View File

@@ -37,6 +37,7 @@ import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.utils.ThreadUtils;
@@ -105,6 +106,17 @@ public class AvatarViewMixin implements LifecycleObserver {
return; return;
} }
// Set a component name since activity embedding requires a component name for
// registering a rule.
intent.setComponent(matchedIntents.get(0).getComponentInfo().getComponentName());
ActivityEmbeddingRulesController.registerTwoPanePairRuleForSettingsHome(
mContext,
intent.getComponent(),
intent.getAction(),
false /* finishPrimaryWithSecondary */,
true /* finishSecondaryWithPrimary */,
false /* clearTop */);
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
.logSettingsTileClick(KEY_AVATAR_ICON, SettingsEnums.SETTINGS_HOMEPAGE); .logSettingsTileClick(KEY_AVATAR_ICON, SettingsEnums.SETTINGS_HOMEPAGE);