Merge "Update the string of Settings preference for device lock" into udc-dev
diff --git a/res/values/themes.xml b/res/values/themes.xml
index eeba1c7..e3c1b20 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -132,6 +132,8 @@
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:clipToPadding">true</item>
<item name="android:clipChildren">true</item>
+ <item name="android:textDirection">locale</item>
+ <item name="android:layoutDirection">locale</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Widget.ActionBar</item>
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
index b75fa8c..c54b750 100644
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -190,6 +190,7 @@
when(mockUsbPort.getStatus()).thenReturn(mockUsbPortStatus);
when(mockUsbPort.supportsComplianceWarnings()).thenReturn(true);
when(mockUsbPortStatus.isConnected()).thenReturn(true);
- when(mockUsbPortStatus.getComplianceWarnings()).thenReturn(new int[]{1});
+ when(mockUsbPortStatus.getComplianceWarnings())
+ .thenReturn(new int[]{UsbPortStatus.COMPLIANCE_WARNING_OTHER});
}
}