Factor out HelpUtils into @SystemAPI lib
This is the first of a few sub-libraries that will get factored out of
the settings lib. These libs will be included by mainline modules which
are compiles against system-api.
Bug: 110953302
Test: Looked at UI
m -j RunRoboSettingsLibTests
Change-Id: I16347e565aca554d6a8653df35765c2194479e78
diff --git a/api/system-current.txt b/api/system-current.txt
index a9afb3f..bd51ff6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -213,11 +213,24 @@
field public static final int userRestriction = 16844164; // 0x1010584
}
+ public static final class R.bool {
+ field public static final int config_sendPackageName = 17891328; // 0x1110000
+ }
+
public static final class R.raw {
field public static final int loaderror = 17825792; // 0x1100000
field public static final int nodomain = 17825793; // 0x1100001
}
+ public static final class R.string {
+ field public static final int config_feedback_intent_extra_key = 17039391; // 0x104001f
+ field public static final int config_feedback_intent_name_key = 17039392; // 0x1040020
+ field public static final int config_help_intent_extra_key = 17039389; // 0x104001d
+ field public static final int config_help_intent_name_key = 17039390; // 0x104001e
+ field public static final int config_help_package_name_key = 17039387; // 0x104001b
+ field public static final int config_help_package_name_value = 17039388; // 0x104001c
+ }
+
public static final class R.style {
field public static final int Theme_Leanback_FormWizard = 16974544; // 0x10302d0
}
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 836e824..5d84e30 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3363,22 +3363,22 @@
<bool name="config_sendPackageName">false</bool>
<!-- Name for the set of keys associating package names -->
- <string name="config_helpPackageNameKey" translatable="false"></string>
+ <string name="config_help_package_name_key" translatable="false"></string>
<!-- Name for the set of values of package names -->
- <string name="config_helpPackageNameValue" translatable="false"></string>
+ <string name="config_help_package_name_value" translatable="false"></string>
<!-- Intent key for the package name keys -->
- <string name="config_helpIntentExtraKey" translatable="false"></string>
+ <string name="config_help_intent_extra_key" translatable="false"></string>
<!-- Intent key for package name values -->
- <string name="config_helpIntentNameKey" translatable="false"></string>
+ <string name="config_help_intent_name_key" translatable="false"></string>
<!-- Intent key for the package name keys -->
- <string name="config_feedbackIntentExtraKey" translatable="false"></string>
+ <string name="config_feedback_intent_extra_key" translatable="false"></string>
<!-- Intent key for package name values -->
- <string name="config_feedbackIntentNameKey" translatable="false"></string>
+ <string name="config_feedback_intent_name_key" translatable="false"></string>
<!-- The apps that need to be hidden when they are disabled -->
<string-array name="config_hideWhenDisabled_packageNames"></string-array>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e25bb79..d464ab7 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2918,6 +2918,23 @@
</public-group>
<public-group type="string" first-id="0x0104001b">
+ <!-- @hide @SystemApi -->
+ <public name="config_help_package_name_key" />
+ <!-- @hide @SystemApi -->
+ <public name="config_help_package_name_value" />
+ <!-- @hide @SystemApi -->
+ <public name="config_help_intent_extra_key" />
+ <!-- @hide @SystemApi -->
+ <public name="config_help_intent_name_key" />
+ <!-- @hide @SystemApi -->
+ <public name="config_feedback_intent_extra_key" />
+ <!-- @hide @SystemApi -->
+ <public name="config_feedback_intent_name_key" />
+ </public-group>
+
+ <public-group type="bool" first-id="0x01110000">
+ <!-- @hide @SystemApi -->
+ <public name="config_sendPackageName" />
</public-group>
<!-- ===============================================================
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 8ac2474..363e1e1 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3253,12 +3253,12 @@
<java-symbol type="integer" name="default_data_warning_level_mb" />
<java-symbol type="bool" name="config_useVideoPauseWorkaround" />
<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="string" name="config_help_package_name_key" />
+ <java-symbol type="string" name="config_help_package_name_value" />
+ <java-symbol type="string" name="config_help_intent_extra_key" />
+ <java-symbol type="string" name="config_help_intent_name_key" />
+ <java-symbol type="string" name="config_feedback_intent_extra_key" />
+ <java-symbol type="string" name="config_feedback_intent_name_key" />
<java-symbol type="array" name="config_hideWhenDisabled_packageNames" />
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 4791517..57767e9 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -11,6 +11,10 @@
"androidx.lifecycle_lifecycle-runtime",
],
+ static_libs: [
+ "SettingsLibHelpUtils",
+ ],
+
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
// LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
diff --git a/packages/SettingsLib/HelpUtils/Android.bp b/packages/SettingsLib/HelpUtils/Android.bp
new file mode 100644
index 0000000..af60185
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/Android.bp
@@ -0,0 +1,9 @@
+android_library {
+ name: "SettingsLibHelpUtils",
+
+ srcs: ["src/**/*.java"],
+ resource_dirs: ["res"],
+
+ sdk_version: "system_current",
+ min_sdk_version: "21",
+}
diff --git a/packages/SettingsLib/HelpUtils/AndroidManifest.xml b/packages/SettingsLib/HelpUtils/AndroidManifest.xml
new file mode 100644
index 0000000..35b3933
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settingslib.helputils">
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
diff --git a/packages/SettingsLib/res/drawable/ic_help_actionbar.xml b/packages/SettingsLib/HelpUtils/res/drawable/ic_help_actionbar.xml
similarity index 100%
rename from packages/SettingsLib/res/drawable/ic_help_actionbar.xml
rename to packages/SettingsLib/HelpUtils/res/drawable/ic_help_actionbar.xml
diff --git a/packages/SettingsLib/HelpUtils/res/values/strings.xml b/packages/SettingsLib/HelpUtils/res/values/strings.xml
new file mode 100644
index 0000000..ae07f5d
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Label for Help and feedback menu item -->
+ <string name="help_feedback_label">Help & feedback</string>
+
+</resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
similarity index 91%
rename from packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
rename to packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
index 4cbeb8a..7306d968 100644
--- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
+++ b/packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
@@ -33,12 +33,11 @@
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
import java.net.URISyntaxException;
import java.util.Locale;
+import com.android.settingslib.helputils.R;
+
/**
* Functions to easily prepare contextual help menu option items with an intent that opens up the
* browser to a particular URL, while taking into account the preferred language and app version.
@@ -115,9 +114,13 @@
helpMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
+ /**
+ * TODO: Enable metrics logger for @SystemApi (b/111552654)
+ *
MetricsLogger.action(activity,
MetricsEvent.ACTION_SETTING_HELP_AND_FEEDBACK,
intent.getStringExtra(EXTRA_CONTEXT));
+ */
try {
activity.startActivityForResult(intent, 0);
} catch (ActivityNotFoundException exc) {
@@ -180,23 +183,21 @@
Resources resources = context.getResources();
boolean includePackageName =
- resources.getBoolean(com.android.internal.R.bool.config_sendPackageName);
+ resources.getBoolean(android.R.bool.config_sendPackageName);
if (sendPackageName && includePackageName) {
String[] packageNameKey =
- {resources.getString(com.android.internal.R.string.config_helpPackageNameKey)};
+ {resources.getString(android.R.string.config_help_package_name_key)};
String[] packageNameValue =
- {resources.getString(
- com.android.internal.R.string.config_helpPackageNameValue)};
+ {resources.getString(android.R.string.config_help_package_name_value)};
String helpIntentExtraKey =
- resources.getString(com.android.internal.R.string.config_helpIntentExtraKey);
+ resources.getString(android.R.string.config_help_intent_extra_key);
String helpIntentNameKey =
- resources.getString(com.android.internal.R.string.config_helpIntentNameKey);
+ resources.getString(android.R.string.config_help_intent_name_key);
String feedbackIntentExtraKey =
- resources.getString(
- com.android.internal.R.string.config_feedbackIntentExtraKey);
+ resources.getString(android.R.string.config_feedback_intent_extra_key);
String feedbackIntentNameKey =
- resources.getString(com.android.internal.R.string.config_feedbackIntentNameKey);
+ resources.getString(android.R.string.config_feedback_intent_name_key);
intent.putExtra(helpIntentExtraKey, packageNameKey);
intent.putExtra(helpIntentNameKey, packageNameValue);
intent.putExtra(feedbackIntentExtraKey, packageNameKey);
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 6bc07c2..ea6844e 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -1028,8 +1028,6 @@
<!-- Description for a custom screen zoom level. This shows the requested display
density in raw pixels per inch rather than using a relative description. [CHAR LIMIT=24] -->
<string name="screen_zoom_summary_custom">Custom (<xliff:g id="densityDpi" example="160">%d</xliff:g>)</string>
- <!-- Label for Help and feedback menu item -->
- <string name="help_feedback_label">Help & feedback</string>
<!-- Content description for drawer menu button [CHAR_LIMIT=30]-->
<string name="content_description_menu_button">Menu</string>
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
index 7553313..1091e16 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
@@ -36,7 +36,7 @@
import android.provider.Settings;
import android.view.MenuItem;
-import com.android.internal.R;
+import android.R;
import org.junit.Before;
import org.junit.Test;
@@ -70,17 +70,17 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mContext.getResources().getString(R.string.config_helpPackageNameKey))
+ when(mContext.getResources().getString(R.string.config_help_package_name_key))
.thenReturn(PACKAGE_NAME_KEY);
- when(mContext.getResources().getString(R.string.config_helpPackageNameValue))
+ when(mContext.getResources().getString(R.string.config_help_package_name_value))
.thenReturn(PACKAGE_NAME_VALUE);
- when(mContext.getResources().getString(R.string.config_helpIntentExtraKey))
+ when(mContext.getResources().getString(R.string.config_help_intent_extra_key))
.thenReturn(HELP_INTENT_EXTRA_KEY);
- when(mContext.getResources().getString(R.string.config_helpIntentNameKey))
+ when(mContext.getResources().getString(R.string.config_help_intent_name_key))
.thenReturn(HELP_INTENT_NAME_KEY);
- when(mContext.getResources().getString(R.string.config_feedbackIntentExtraKey))
+ when(mContext.getResources().getString(R.string.config_feedback_intent_extra_key))
.thenReturn(FEEDBACK_INTENT_EXTRA_KEY);
- when(mContext.getResources().getString(R.string.config_feedbackIntentNameKey))
+ when(mContext.getResources().getString(R.string.config_feedback_intent_name_key))
.thenReturn(FEEDBACK_INTENT_NAME_KEY);
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
@@ -173,4 +173,4 @@
verify(item).setVisible(true);
verify(item).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
-}
\ No newline at end of file
+}