Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 426716c..31a1872 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2224,7 +2224,7 @@
<!-- Title of a preference for updating emergency address [CHAR LIMIT=40] -->
<string name="emergency_address_title">Update Emergency Address</string>
<!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
- <string name="emergency_address_summary">Address used by emergency services as your location if you make a 911 call using WiFi</string>
+ <string name="emergency_address_summary">Address used by emergency services as your location if you make an emergency call using Wi\u2011Fi</string>
<!-- Sound and alerts settings -->
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 4455655..53b6526 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -15,10 +15,11 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:title="@string/assist_gesture_title">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:key="gesture_assist_settings_page"
+ android:title="@string/assist_gesture_title">
<com.android.settings.widget.VideoPreference
android:key="gesture_assist_video"
@@ -28,6 +29,6 @@
<SwitchPreference
android:key="gesture_assist"
android:title="@string/assist_gesture_title"
- app:keywords="@string/keywords_assist_gesture_launch"/>
+ app:keywords="@string/keywords_assist_gesture_launch" />
</PreferenceScreen>
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index a0e56c1..bcc2346 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -219,10 +219,8 @@
CharSequence timeString = Utils.formatElapsedTime(context,
BatteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ?
- (basedOnUsage ?
- R.string.power_remaining_duration_only_short_enhanced :
- R.string.power_remaining_duration_only_short) :
- (basedOnUsage ?
+ R.string.power_remaining_duration_only_short :
+ (basedOnUsage ?
R.string.power_remaining_duration_only_enhanced :
R.string.power_remaining_duration_only)), timeString);
info.chargeLabel = TextUtils.expandTemplate(context.getText(
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 433f7d6..ee6ebb2 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -887,7 +887,7 @@
public void onBatteryInfoLoaded(BatteryInfo info) {
mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
}
- });
+ }, true /* shortString */);
});
}
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index cb9e473..3066baf 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -79,9 +79,17 @@
}
@Override
- public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ public List<AbstractPreferenceController> getPreferenceControllers(
+ Context context) {
return buildPreferenceControllers(context, null /* lifecycle */);
}
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return new AssistGesturePreferenceController(context, null /* lifecycle */,
+ null /* key */, false /* assistOnly */)
+ .isAvailable();
+ }
};
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 9bd0b6f..7392eb6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -131,7 +131,7 @@
}
@Test
- public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() {
+ public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
1000, true /* basedOnUsage */);
@@ -139,8 +139,10 @@
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
1000, true /* basedOnUsage */);
+ // We only add special mention for the long string
assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
- assertThat(info2.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
+ // shortened string should not have extra text
+ assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 1ed030f..cfd3f52 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -17,7 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -34,6 +34,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@@ -45,14 +46,12 @@
@Mock
private Context mContext;
private FakeFeatureFactory mFakeFeatureFactory;
- private AssistGestureFeatureProvider mFeatureProvider;
private AssistGestureSettings mSettings;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
- mFeatureProvider = mFakeFeatureFactory.getAssistGestureFeatureProvider();
mSettings = new AssistGestureSettings();
}
@@ -65,7 +64,7 @@
@Test
public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers =
- mSettings.getPreferenceControllers(mContext);
+ mSettings.getPreferenceControllers(mContext);
assertThat(controllers.isEmpty()).isFalse();
}
@@ -79,5 +78,15 @@
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
}
+
+ @Test
+ public void testSearchIndexProvider_noSensor_shouldDisablePageSearch() {
+ when(mFakeFeatureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
+ .thenReturn(false);
+
+ assertThat(AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+ RuntimeEnvironment.application))
+ .contains("gesture_assist_settings_page");
+ }
}