jackqdyulei 040c21bcb5 Add strings in battery usage page ...

Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time

Bug: 37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27

2017-06-01 14:38:00 -07:00

..

accessibility

Merge "Manual merge of ag/2319717"

2017-05-30 19:46:18 +00:00

accounts

AccountTypePreference layout clean up.

2017-05-30 14:52:51 -07:00

applications

Merge "Fix a bug where cache was double-counted." into oc-dev am: 7035a41715

2017-06-01 17:48:41 +00:00

backup

Add search index for support dashboard activity.

2017-05-31 14:15:14 -07:00

bluetooth

Add a flag for the Bluetooth device details page

2017-05-24 16:37:42 -07:00

connecteddevice

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

core

Add search index for support dashboard activity.

2017-05-31 14:15:14 -07:00

dashboard

Merge "Pass component name into SuggestionFeatureProvider"

2017-06-01 19:33:29 +00:00

datausage

Merge "Set correct uid when loading app icon in data usage UI."

2017-05-25 02:13:13 +00:00

datetime

…

deletionhelper

…

development

Bluetooth: Enable in-band ringing by default (1/2)

2017-05-30 15:17:33 -07:00

deviceinfo

Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit

2017-05-31 09:05:30 -06:00

display

AOD: Ambient display settings to dedicated settings screen

2017-05-30 16:42:37 -07:00

dream

…

enterprise

…

fingerprint

Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am: 98b67a4e94

2017-06-01 08:25:07 +00:00

fuelgauge

Add strings in battery usage page

2017-06-01 14:38:00 -07:00

gestures

Merge "Add metrics category for the assist gesture settings."

2017-05-25 16:18:54 +00:00

inputmethod

…

language

Remove Language and Input duplicates

2017-05-18 13:57:54 -07:00

localepicker

…

location

…

network

Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890

2017-05-25 02:37:59 +00:00

nfc

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

notification

Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3

2017-05-26 15:02:40 +00:00

overlay

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

password

Merge "Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential"

2017-05-31 04:33:34 +00:00

print

Add # of active print jobs back to print setting summary

2017-05-26 16:45:14 -07:00

qstile

…

search

Merge "Add search index for support dashboard activity."

2017-06-01 17:03:06 +00:00

security

Use the standard place holder for the security summary.

2017-05-26 16:47:09 -07:00

sim

…

support

Add search index for support dashboard activity.

2017-05-31 14:15:14 -07:00

survey

…

system

Merge "Allow FR in carrier demo mode" into oc-dev am: 9ef166a578

2017-05-31 22:54:31 +00:00

trustagent

…

tts

…

users

…

utils

…

vpn2

…

wallpaper

…

webview

…

wfd

…

widget

Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am: bbc260d408

2017-05-30 22:11:21 +00:00

wifi

Merge "Wifi details page: sign-in uses primary color" into oc-dev am: 0c5573a0e3

2017-05-31 00:47:54 +00:00

AccessiblePreferenceCategory.java

…

ActivityPicker.java

…

AirplaneModeEnabler.java

…

AirplaneModeVoiceActivity.java

…

AllowBindAppWidgetActivity.java

…

ApnEditor.java

Disallow adding/editing dun APNs unless allowed by carrier.

2017-05-22 16:01:46 -07:00

ApnPreference.java

…

ApnSettings.java

Disallow adding/editing dun APNs unless allowed by carrier.

2017-05-22 16:01:46 -07:00

AppHeader.java

…

ApplicationSettings.java

…

AppProgressPreference.java

…

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BandMode.java

…

BrightnessPreference.java

…

BugreportPreference.java

…

ButtonBarHandler.java

…

CancellablePreference.java

…

CheckableLinearLayout.java

…

CreateShortcut.java

…

CredentialStorage.java

…

CryptKeeper.java

…

CryptKeeperConfirm.java

…

CryptKeeperSettings.java

…

CustomDialogPreference.java

…

CustomEditTextPreference.java

…

CustomListPreference.java

…

DateTimeSettings.java

…

DefaultRingtonePreference.java

…

DeviceAdminAdd.java

Disabling the activate button when paused

2017-05-26 15:53:32 -07:00

DeviceAdminSettings.java

…

DeviceInfoSettings.java

Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b

2017-05-17 17:31:08 +00:00

DialogCreatable.java

…

DimmableIconPreference.java

…

DisplaySettings.java

AOD: Ambient display settings to dedicated settings screen

2017-05-30 16:42:37 -07:00

DividerPreference.java

…

EditPinPreference.java

…

EncryptionAndCredential.java

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

EncryptionInterstitial.java

…

EventLogTags.logtags

…

FallbackHome.java

…

HelpTrampoline.java

…

HotspotOffReceiver.java

…

IccLockSettings.java

…

IconPreferenceScreen.java

…

LegalSettings.java

…

LicenseHtmlGeneratorFromXml.java

…

LicenseHtmlLoader.java

…

LinkifyUtils.java

…

ManualDisplayActivity.java

…

MasterClear.java

Hide "Wipe eUICC" option when it isn't useful.

2017-05-24 16:20:58 -07:00

MasterClearConfirm.java

…

MonitoringCertInfoActivity.java

…

MultiLinePreference.java

…

OptionsMenuFragment.java

…

OwnerInfoSettings.java

…

PointerSpeedPreference.java

…

PreviewPagerAdapter.java

…

PreviewSeekBarPreferenceFragment.java

…

PrivacySettings.java

…

ProgressCategory.java

…

ProgressCategoryBase.java

…

ProxySelector.java

…

RadioInfo.java

…

RegulatoryInfoDisplayActivity.java

…

RemoteBugreportActivity.java

…

ResetNetwork.java

…

ResetNetworkConfirm.java

…

RestrictedCheckBox.java

…

RestrictedListPreference.java

…

RestrictedRadioButton.java

…

RestrictedSettingsFragment.java

…

RingtonePreference.java

…

ScreenPinningSettings.java

…

SecuritySettings.java

Remove duplicates in Security Settings

2017-05-23 17:44:35 +00:00

SeekBarDialogPreference.java

…

SelectableEditTextPreference.java

…

SelfAvailablePreference.java

…

SetFullBackupPassword.java

…

Settings.java

…

SettingsActivity.java

Merge "Initial search bar implementation."

2017-06-01 06:43:22 +00:00

SettingsDumpService.java

…

SettingsInitialize.java

…

SettingsLicenseActivity.java

…

SettingsPreferenceFragment.java

Update updateEmptyView

2017-05-26 10:53:53 -07:00

SetupEncryptionInterstitial.java

…

SetupRedactionInterstitial.java

…

SetupWizardUtils.java

…

ShowAdminSupportDetailsDialog.java

…

SmsDefaultDialog.java

…

SubSettings.java

…

SummaryPreference.java

…

TestingSettings.java

…

TestingSettingsBroadcastReceiver.java

…

TetherProvisioningActivity.java

…

TetherService.java

…

TetherSettings.java

Update summary for Hotspot & Tethering.

2017-05-30 17:28:06 -07:00

TimeoutListPreference.java

…

TintablePreference.java

…

TouchBlockingFrameLayout.java

…

TrustAgentSettings.java

…

TrustAgentUtils.java

…

TrustedCredentialsDialogBuilder.java

…

TrustedCredentialsSettings.java

…

UsageStatsActivity.java

…

UserCredentialsSettings.java

…

UserDictionarySettings.java

…

Utils.java

Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential

2017-05-30 18:25:18 -07:00

WifiCallingSettings.java

Show aditional WiFi calling message.

2017-05-22 15:46:31 +00:00

WorkOnlyCategory.java

…