Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index c497015..8b03529 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -48,7 +48,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@null"
- android:src="@drawable/face_enroll_intro_illustration"/>
+ android:src="@drawable/face_enroll_intro_illustration"
+ android:layout_marginBottom="@dimen/face_enroll_intro_illustration_margin_bottom"/>
</FrameLayout>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2b5b7de..d130991 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -527,7 +527,7 @@
</string-array>
<string-array name="cdma_system_select_choices">
<item msgid="1205665684426617345">"ഹോം മാത്രം"</item>
- <item msgid="6691772120712000966">"സ്വമേധയാ"</item>
+ <item msgid="6691772120712000966">"സ്വയമേവ"</item>
</string-array>
<string-array name="preferred_network_mode_choices">
<item msgid="5746729990546256950">"മുൻഗണന നൽകുന്നത് GSM/WCDMA"</item>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 99ccb46..40cbe6f 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -248,10 +248,10 @@
<item msgid="2527973826970434181">"फोनवर कॉल करा"</item>
<item msgid="2766022553327609913">"SMS वाचा"</item>
<item msgid="167775364051357284">"SMS लिहा"</item>
- <item msgid="3397583039407928979">"SMS प्राप्त करा"</item>
- <item msgid="3658964859478786980">"आणीबाणी SMS प्राप्त करा"</item>
- <item msgid="7975129014728281140">"MMS प्राप्त करा"</item>
- <item msgid="404809195686849835">"WAP पुश प्राप्त करा"</item>
+ <item msgid="3397583039407928979">"SMS मिळवा"</item>
+ <item msgid="3658964859478786980">"आणीबाणी SMS मिळवा"</item>
+ <item msgid="7975129014728281140">"MMS मिळवा"</item>
+ <item msgid="404809195686849835">"WAP पुश मिळवा"</item>
<item msgid="5167716820004184705">"SMS पाठवा"</item>
<item msgid="3834284815734286927">"ICC SMS वाचा"</item>
<item msgid="6394881108820762646">"ICC SMS लिहा"</item>
@@ -315,10 +315,10 @@
<item msgid="5019327268152480733">"फोनवर कॉल करा"</item>
<item msgid="8001855901083066554">"SMS/MMS वाचा"</item>
<item msgid="187744670643011148">"SMS/MMS लिहा"</item>
- <item msgid="3324078624274013835">"SMS/MMS प्राप्त करा"</item>
- <item msgid="1924065490920451511">"SMS/MMS प्राप्त करा"</item>
- <item msgid="1239934115787777477">"SMS/MMS प्राप्त करा"</item>
- <item msgid="1030342664910454057">"SMS/MMS प्राप्त करा"</item>
+ <item msgid="3324078624274013835">"SMS/MMS मिळवा"</item>
+ <item msgid="1924065490920451511">"SMS/MMS मिळवा"</item>
+ <item msgid="1239934115787777477">"SMS/MMS मिळवा"</item>
+ <item msgid="1030342664910454057">"SMS/MMS मिळवा"</item>
<item msgid="9189359977063200554">"SMS/MMS पाठवा"</item>
<item msgid="6954817837534799424">"SMS/MMS वाचा"</item>
<item msgid="7921014514153395846">"SMS/MMS लिहा"</item>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 052cca7..e220e4f 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -272,7 +272,7 @@
<item msgid="5272927168355895681">"అలారం వాల్యూమ్"</item>
<item msgid="4422070755065530548">"నోటిఫికేషన్ వాల్యూమ్"</item>
<item msgid="3250654589277825306">"బ్లూటూత్ వాల్యూమ్"</item>
- <item msgid="4212187233638382465">"సక్రియంగా ఉంచండి"</item>
+ <item msgid="4212187233638382465">"యాక్టివ్‌గా ఉంచండి"</item>
<item msgid="5099026183238335900">"లొకేషన్‌ను పర్యవేక్షించండి"</item>
<item msgid="2297727967385895059">"అధిక శక్తివంతమైన లొకేషన్‌ను పర్యవేక్షించండి"</item>
<item msgid="8700593962030471569">"వినియోగ గణాంకాలను పొందండి"</item>
@@ -304,7 +304,7 @@
<item msgid="5728662879095632194">"లొకేషన్"</item>
<item msgid="4104617224667554750">"వైబ్రేట్"</item>
<item msgid="1623646715189708947">"కాంటాక్ట్‌లను చదవండి"</item>
- <item msgid="5060760609109972207">"కాంటాక్ట్‌లను సవరించండి"</item>
+ <item msgid="5060760609109972207">"కాంటాక్ట్‌లను ఎడిట్ చేయండి"</item>
<item msgid="7451260062940797278">"కాల్ లాగ్‌ను చదవండి"</item>
<item msgid="2348589304974534308">"కాల్ లాగ్‌ను ఎడిట్ చేయండి"</item>
<item msgid="4089146706115315300">"క్యాలెండర్‌ను చదవండి"</item>
@@ -339,7 +339,7 @@
<item msgid="4266577290496513640">"అలారం వాల్యూమ్"</item>
<item msgid="8608084169623998854">"నోటిఫికేషన్ వాల్యూమ్"</item>
<item msgid="7948784184567841794">"బ్లూటూత్ వాల్యూమ్"</item>
- <item msgid="1148968792599973150">"సక్రియంగా ఉంచండి"</item>
+ <item msgid="1148968792599973150">"యాక్టివ్‌గా ఉంచండి"</item>
<item msgid="8482874682804856549">"లొకేషన్"</item>
<item msgid="5186169827582545242">"లొకేషన్"</item>
<item msgid="6122293931012635638">"వినియోగ గణాంకాలను పొందండి"</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f03794a..26ebbf6 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -235,6 +235,7 @@
<item name="face_preview_translate_y" format="float" type="dimen">0</item>
<item name="face_preview_translate_x" format="float" type="dimen">0</item>
<item name="face_preview_scale" format="float" type="dimen">1.0</item>
+ <dimen name="face_enroll_intro_illustration_margin_bottom">0dp</dimen>
<!-- Confirm device credentials -->
<dimen name="confirm_credentials_security_method_margin">48dp</dimen>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f951501..4341851 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -70,6 +70,7 @@
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.homepage.TopLevelSettings;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.PasswordUtils;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -154,6 +155,7 @@
public static final String EXTRA_IS_FROM_SLICE = "is_from_slice";
public static final String EXTRA_USER_HANDLE = "user_handle";
+ public static final String EXTRA_INITIAL_CALLING_PACKAGE = "initial_calling_package";
/**
* Personal or Work profile tab of {@link ProfileSelectFragment}
@@ -418,6 +420,8 @@
}
private boolean tryStartTwoPaneDeepLink(Intent intent) {
+ intent.putExtra(EXTRA_INITIAL_CALLING_PACKAGE, PasswordUtils.getCallingAppPackageName(
+ getActivityToken()));
final Intent trampolineIntent;
if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {
// Get menu key for slice deep link case.
@@ -505,6 +509,17 @@
return true;
}
+ /** Returns the initial calling package name that launches the activity. */
+ public String getInitialCallingPackage() {
+ String callingPackage = PasswordUtils.getCallingAppPackageName(getActivityToken());
+ if (!TextUtils.equals(callingPackage, getPackageName())) {
+ return callingPackage;
+ }
+
+ String initialCallingPackage = getIntent().getStringExtra(EXTRA_INITIAL_CALLING_PACKAGE);
+ return TextUtils.isEmpty(initialCallingPackage) ? callingPackage : initialCallingPackage;
+ }
+
/** Returns the initial fragment name that the activity will launch. */
@VisibleForTesting
public String getInitialFragmentName(Intent intent) {
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 7e6eefe..ea8a5f5 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -25,9 +25,9 @@
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.password.PasswordUtils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.slices.SlicePreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -71,8 +71,8 @@
super.onAttach(context);
final boolean nearbyEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);
- String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
- getActivity().getActivityToken());
+ String callingAppPackageName = ((SettingsActivity) getActivity())
+ .getInitialCallingPackage();
String action = getIntent() != null ? getIntent().getAction() : "";
if (DEBUG) {
Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName