Merge "Import translations. DO NOT MERGE"
diff --git a/res/layout/homepage_condition_full_tile.xml b/res/layout/homepage_condition_full_tile.xml
index 3d261ca..e90a0cb 100644
--- a/res/layout/homepage_condition_full_tile.xml
+++ b/res/layout/homepage_condition_full_tile.xml
@@ -30,7 +30,7 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/homepage_card_padding_start"
+ android:paddingStart="@dimen/homepage_card_icon_padding_start"
android:paddingEnd="@dimen/homepage_full_card_padding_end"
android:paddingTop="@dimen/homepage_condition_full_card_padding_top"
android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"
diff --git a/res/layout/homepage_condition_half_tile.xml b/res/layout/homepage_condition_half_tile.xml
index 308b3a6..1086f2d 100644
--- a/res/layout/homepage_condition_half_tile.xml
+++ b/res/layout/homepage_condition_half_tile.xml
@@ -31,7 +31,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/homepage_card_padding_start"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:orientation="vertical">
@@ -39,6 +38,7 @@
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
android:layout_height="@dimen/homepage_card_icon_size"
+ android:layout_marginStart="@dimen/homepage_card_icon_padding_start"
android:tint="?android:attr/colorAccent"/>
<TextView
@@ -47,6 +47,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"
android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
@@ -57,6 +58,7 @@
android:layout_height="wrap_content"
android:lines="2"
android:ellipsize="end"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"
android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>
diff --git a/res/layout/homepage_slice_deferred_setup_tile.xml b/res/layout/homepage_slice_deferred_setup_tile.xml
index 68916ee..ed096b0 100644
--- a/res/layout/homepage_slice_deferred_setup_tile.xml
+++ b/res/layout/homepage_slice_deferred_setup_tile.xml
@@ -27,7 +27,6 @@
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical"
- android:paddingStart="@dimen/homepage_card_padding_start"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"
android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">
@@ -35,12 +34,14 @@
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
- android:layout_height="@dimen/homepage_card_icon_size"/>
+ android:layout_height="@dimen/homepage_card_icon_size"
+ android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"
android:ellipsize="end"
android:maxLines="2"
@@ -51,6 +52,7 @@
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"
android:ellipsize="end"
android:maxLines="2"
@@ -62,6 +64,7 @@
style="@style/DeferredSetupCardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"
android:text="@string/suggestion_button_text"/>
diff --git a/res/layout/homepage_slice_half_tile.xml b/res/layout/homepage_slice_half_tile.xml
index fc99561..8b6d415 100644
--- a/res/layout/homepage_slice_half_tile.xml
+++ b/res/layout/homepage_slice_half_tile.xml
@@ -30,7 +30,6 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/homepage_card_padding_start"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingTop="@dimen/homepage_half_card_padding_top"
android:paddingBottom="@dimen/homepage_half_card_padding_bottom"
@@ -39,7 +38,8 @@
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
- android:layout_height="@dimen/homepage_card_icon_size"/>
+ android:layout_height="@dimen/homepage_card_icon_size"
+ android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
<TextView
android:id="@android:id/title"
@@ -48,6 +48,7 @@
android:maxLines="2"
android:minLines="1"
android:ellipsize="end"
+ android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4ac0db8..aeeb403 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -331,7 +331,8 @@
<dimen name="homepage_card_icon_size">24dp</dimen>
<dimen name="homepage_card_vertical_margin">8dp</dimen>
<dimen name="homepage_card_side_margin">4dp</dimen>
- <dimen name="homepage_card_padding_start">16dp</dimen>
+ <dimen name="homepage_card_icon_padding_start">14dp</dimen>
+ <dimen name="homepage_card_text_padding_start">16dp</dimen>
<dimen name="homepage_card_padding_end">16dp</dimen>
<dimen name="homepage_full_card_padding_end">12dp</dimen>
<dimen name="homepage_half_card_padding_top">12dp</dimen>
@@ -369,13 +370,13 @@
<dimen name="homepage_condition_half_card_padding_top">12dp</dimen>
<dimen name="homepage_condition_half_card_title_margin_top">12dp</dimen>
<dimen name="homepage_condition_half_card_summary_margin_bottom">12dp</dimen>
- <dimen name="homepage_condition_full_card_padding_start">12dp</dimen>
+ <dimen name="homepage_condition_full_card_padding_start">24dp</dimen>
<dimen name="homepage_condition_full_card_padding_end">16dp</dimen>
<dimen name="homepage_condition_full_card_padding_top">12dp</dimen>
<dimen name="homepage_condition_full_card_padding_bottom">12dp</dimen>
<dimen name="homepage_condition_header_padding_top">10dp</dimen>
<dimen name="homepage_condition_header_padding_bottom">10dp</dimen>
- <dimen name="homepage_condition_header_icons_margin_start">16dp</dimen>
+ <dimen name="homepage_condition_header_icons_margin_start">14dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_top">4dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_start">16dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_end">16dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 46e2cef..92a4098 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -448,7 +448,7 @@
<style name="ConditionFullCardBorderlessButton"
parent="@style/ConditionCardBorderlessButton">
<item name="android:textAlignment">viewStart</item>
- <item name="android:paddingStart">50dp</item>
+ <item name="android:paddingStart">62dp</item>
<item name="android:paddingEnd">50dp</item>
</style>
@@ -484,8 +484,8 @@
</style>
<style name="SliceViewStyle">
- <!-- 4dp start padding for the start icon -->
- <item name="android:paddingStart">4dp</item>
+ <!-- 2dp start padding for the start icon -->
+ <item name="android:paddingStart">2dp</item>
<!-- End margin of content without end items is 24dp.
android:paddingEnd = 24 - 16(contentEndPadding) -->
@@ -497,8 +497,8 @@
<style name="SliceRowStyle">
<item name="titleItemEndPadding">0dp</item>
- <!-- Padding between content and the start icon is 12dp. -->
- <item name="contentStartPadding">12dp</item>
+ <!-- Padding between content and the start icon is 14dp. -->
+ <item name="contentStartPadding">14dp</item>
<!-- Padding between content and end items is 16dp. -->
<item name="contentEndPadding">16dp</item>
@@ -508,9 +508,9 @@
<item name="endItemEndPadding">8dp</item>
<!-- Both side margins of bottom divider are 12dp.
- bottomDividerStartPadding = 12 - 4(android:paddingStart)
+ bottomDividerStartPadding = 12 - 2(android:paddingStart)
bottomDividerEndPadding = 12 - 8(android:paddingEnd) -->
- <item name="bottomDividerStartPadding">8dp</item>
+ <item name="bottomDividerStartPadding">10dp</item>
<item name="bottomDividerEndPadding">4dp</item>
<item name="actionDividerHeight">32dp</item>
diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index cbff3ea..12dbd57 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -52,12 +52,12 @@
@Override
public boolean isChecked() {
- return mNfcAdapter.isNfcSecureEnabled();
+ return mNfcAdapter.isSecureNfcEnabled();
}
@Override
public boolean setChecked(boolean isChecked) {
- return mNfcAdapter.setNfcSecure(isChecked);
+ return mNfcAdapter.enableSecureNfc(isChecked);
}
@Override
@@ -66,7 +66,7 @@
if (mNfcAdapter == null) {
return UNSUPPORTED_ON_DEVICE;
}
- return mNfcAdapter.deviceSupportsNfcSecure()
+ return mNfcAdapter.isSecureNfcSupported()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 2a8aa8e..3fa0e4d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -80,7 +80,7 @@
Context context = spy(RuntimeEnvironment.application);
when(context.getApplicationContext()).thenReturn(context);
when(NfcAdapter.getDefaultAdapter(context)).thenReturn(mNfcAdapter);
- when(mNfcAdapter.deviceSupportsNfcSecure()).thenReturn(true);
+ when(mNfcAdapter.isSecureNfcSupported()).thenReturn(true);
final List<String> niks =
AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPickerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPickerTest.java
index 6b6ed02..8f63201 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPickerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPickerTest.java
@@ -16,11 +16,11 @@
package com.android.settings.notification;
-import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.RETURNS_SMART_NULLS;
@@ -40,16 +40,20 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
-import org.mockito.invocation.InvocationOnMock;
-import org.robolectric.RobolectricTestRunner;
-
@RunWith(RobolectricTestRunner.class)
public class NotificationAssistantPickerTest {
+ private static final String TEST_PKG = "test.package";
+ private static final String TEST_SRV = "test.component";
+ private static final String TEST_CMP = TEST_PKG + "/" + TEST_SRV;
+ private static final String TEST_NAME = "Test name";
+ private static final ComponentName TEST_COMPONENT = ComponentName.unflattenFromString(TEST_CMP);
private NotificationAssistantPicker mFragment;
@Mock
private Context mContext;
@@ -57,15 +61,11 @@
private PackageManager mPackageManager;
@Mock
private NotificationBackend mNotificationBackend;
- private static final String TEST_PKG = "test.package";
- private static final String TEST_SRV = "test.component";
- private static final String TEST_CMP = TEST_PKG + "/" + TEST_SRV;
- private static final String TEST_NAME = "Test name";
- private static final ComponentName TEST_COMPONENT = ComponentName.unflattenFromString(TEST_CMP);
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
mFragment = new TestNotificationAssistantPicker(mContext, mPackageManager,
mNotificationBackend);
}
@@ -132,7 +132,7 @@
public void noDialogOnNoAssistantSelected() {
when(mContext.getString(anyInt(), anyString())).thenAnswer(
(InvocationOnMock invocation) -> {
- return invocation.getArgument(1);
+ return invocation.getArgument(1);
});
assertNull(mFragment.getConfirmationMessage(
new NotificationAssistantPicker.CandidateNone(mContext)));
diff --git a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
index 11964cd..4665dc9 100644
--- a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
@@ -45,6 +45,7 @@
final List<Uri> uris = mPanel.getSlices();
assertThat(uris).containsExactly(
+ CustomSliceRegistry.VOLUME_REMOTE_MEDIA_URI,
CustomSliceRegistry.VOLUME_CALL_URI,
CustomSliceRegistry.VOLUME_MEDIA_URI,
CustomSliceRegistry.VOLUME_RINGER_URI,