Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move settingslib overlays to framework-res." into oc-dev

Browse Source 
am: 9da73961a7

Change-Id: Iff20fc597f93f22ae50e29d47eec633fbf17a841
This commit is contained in:
Andrew Sapperstein
2017-04-24 18:31:09 +00:00
committed by android-build-merger
parent f25b285706 9da73961a7
commit 23f196f347
8 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/res/res/values/config.xml
View File

@@ -2833,4 +2833,34 @@
<!-- Whether the device uses the default focus highlight when focus state isn't specified. -->
<bool name="config_useDefaultFocusHighlight">true</bool>
<!-- Configuration for automotive -->
<bool name="enable_pbap_pce_profile">false</bool>
<!-- Default data warning level in mb -->
<integer name="default_data_warning_level_mb">2048</integer>
<!-- Whether to send a custom package name with the PSD.-->
<bool name="config_sendPackageName">false</bool>
<!-- Name for the set of keys associating package names -->
<string name="config_helpPackageNameKey" translatable="false"></string>
<!-- Name for the set of values of package names -->
<string name="config_helpPackageNameValue" translatable="false"></string>
<!-- Intent key for the package name keys -->
<string name="config_helpIntentExtraKey" translatable="false"></string>
<!-- Intent key for package name values -->
<string name="config_helpIntentNameKey" translatable="false"></string>
<!-- Intent key for the package name keys -->
<string name="config_feedbackIntentExtraKey" translatable="false"></string>
<!-- Intent key for package name values -->
<string name="config_feedbackIntentNameKey" translatable="false"></string>
<!-- The apps that need to be hidden when they are disabled -->
<string-array name="config_hideWhenDisabled_packageNames"></string-array>
</resources>

14
core/res/res/values/symbols.xml
View File

@@ -2984,4 +2984,18 @@
<java-symbol type="bool" name="config_quickSettingsSupported" />
<java-symbol type="style" name="Theme.DeviceDefault.QuickSettings" />
<java-symbol type="bool" name="enable_pbap_pce_profile" />
<java-symbol type="integer" name="default_data_warning_level_mb" />
<java-symbol type="bool" name="config_sendPackageName" />
<java-symbol type="string" name="config_helpPackageNameKey" />
<java-symbol type="string" name="config_helpPackageNameValue" />
<java-symbol type="string" name="config_helpIntentExtraKey" />
<java-symbol type="string" name="config_helpIntentNameKey" />
<java-symbol type="string" name="config_feedbackIntentExtraKey" />
<java-symbol type="string" name="config_feedbackIntentNameKey" />
<java-symbol type="array" name="config_hideWhenDisabled_packageNames" />
</resources>

49
packages/SettingsLib/res/values/config.xml
View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<!-- Configuration for automotive -->
<bool name="enable_pbap_pce_profile">false</bool>
<!-- Default data warning level in mb -->
<integer name="default_data_warning_level_mb">2048</integer>
<!-- Whether to send a custom package name with the PSD.-->
<bool name="config_sendPackageName">false</bool>
<!-- Name for the set of keys associating package names -->
<string name="config_helpPackageNameKey" translatable="false"></string>
<!-- Name for the set of values of package names -->
<string name="config_helpPackageNameValue" translatable="false"></string>
<!-- Intent key for the package name keys -->
<string name="config_helpIntentExtraKey" translatable="false"></string>
<!-- Intent key for package name values -->
<string name="config_helpIntentNameKey" translatable="false"></string>
<!-- Intent key for the package name keys -->
<string name="config_feedbackIntentExtraKey" translatable="false"></string>
<!-- Intent key for package name values -->
<string name="config_feedbackIntentNameKey" translatable="false"></string>
<!-- The apps that need to be hided when they are disabled -->
<string-array name="config_hideWhenDisabled_packageNames"></string-array>
</resources>

17
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
View File

@@ -180,21 +180,24 @@ public class HelpUtils {
}
Resources resources = context.getResources();
boolean includePackageName = resources.getBoolean(R.bool.config_sendPackageName);
boolean includePackageName =
resources.getBoolean(com.android.internal.R.bool.config_sendPackageName);
if (sendPackageName && includePackageName) {
String[] packageNameKey =
{resources.getString(R.string.config_helpPackageNameKey)};
{resources.getString(com.android.internal.R.string.config_helpPackageNameKey)};
String[] packageNameValue =
{resources.getString(R.string.config_helpPackageNameValue)};
{resources.getString(
com.android.internal.R.string.config_helpPackageNameValue)};
String helpIntentExtraKey =
resources.getString(R.string.config_helpIntentExtraKey);
resources.getString(com.android.internal.R.string.config_helpIntentExtraKey);
String helpIntentNameKey =
resources.getString(R.string.config_helpIntentNameKey);
resources.getString(com.android.internal.R.string.config_helpIntentNameKey);
String feedbackIntentExtraKey =
resources.getString(R.string.config_feedbackIntentExtraKey);
resources.getString(
com.android.internal.R.string.config_feedbackIntentExtraKey);
String feedbackIntentNameKey =
resources.getString(R.string.config_feedbackIntentNameKey);
resources.getString(com.android.internal.R.string.config_feedbackIntentNameKey);
intent.putExtra(helpIntentExtraKey, packageNameKey);
intent.putExtra(helpIntentNameKey, packageNameValue);
intent.putExtra(feedbackIntentExtraKey, packageNameKey);

5
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -50,8 +50,8 @@ import android.util.IconDrawableFactory;
import android.util.Log;
import android.util.SparseArray;
import com.android.internal.R;
import com.android.internal.util.ArrayUtils;
import com.android.settingslib.R;
import java.io.File;
import java.io.IOException;
@@ -1276,8 +1276,7 @@ public class ApplicationsState {
return true;
} else {
this.mounted = false;
this.icon = context.getDrawable(
com.android.internal.R.drawable.sym_app_on_sd_unavailable_icon);
this.icon = context.getDrawable(R.drawable.sym_app_on_sd_unavailable_icon);
}
} else if (!this.mounted) {
// If the app wasn't mounted but is now mounted, reload

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -32,7 +32,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.ParcelUuid;
import android.util.Log;
import com.android.settingslib.R;
import com.android.internal.R;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;

2
packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
View File

@@ -32,7 +32,7 @@ import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.Log;
import com.android.settingslib.R;
import com.android.internal.R;
import java.util.Date;
import java.util.Locale;

1
packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
View File

@@ -27,6 +27,7 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.provider.Settings;
import android.view.MenuItem;
import com.android.internal.R;
import org.junit.Before;
import org.junit.Test;