Merge "Removing unnecessary R.java declaration for subpackages, to make gradle... (0a1103ee) · Commits · e / os / android_frameworks_base

packages/SettingsLib/HelpUtils/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.settingslib.helputils">
		package="com.android.settingslib.widget">

		</manifest>

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,11 +33,11 @@ import android.view.Menu;
		import android.view.MenuItem;
		import android.view.MenuItem.OnMenuItemClickListener;

		import com.android.settingslib.widget.R;

		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.

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.settingslib.restrictedlockutils">
		package="com.android.settingslib.widget">

		</manifest>
		No newline at end of file

+1 −13

Original line number	Diff line number	Diff line
		@@ -71,10 +71,6 @@ android_library {
		"telephony-common",
		],

		aaptflags: [
		"--extra-packages",
		"com.android.keyguard",
		],
		kotlincflags: ["-Xjvm-default=enable"],

		plugins: ["dagger2-compiler-2.19"],
		@@ -132,7 +128,7 @@ android_library {
		kotlincflags: ["-Xjvm-default=enable"],
		aaptflags: [
		"--extra-packages",
		"com.android.keyguard:com.android.systemui",
		"com.android.systemui",
		],
		plugins: ["dagger2-compiler-2.19"],
		}
		@@ -160,10 +156,6 @@ android_app {
		kotlincflags: ["-Xjvm-default=enable"],

		dxflags: ["--multi-dex"],
		aaptflags: [
		"--extra-packages",
		"com.android.keyguard",
		],
		required: ["privapp_whitelist_com.android.systemui"],

		}
		@@ -180,10 +172,6 @@ android_app {
		privileged: true,

		dxflags: ["--multi-dex"],
		aaptflags: [
		"--extra-packages",
		"com.android.keyguard",
		],
		optimize: {
		proguard_flags_files: ["proguard.flags", "legacy/recents/proguard.flags"],
		},

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import android.util.AttributeSet;
		import android.view.View;
		import android.widget.TextView;

		import com.android.systemui.R;

		import java.util.Locale;

		public class CarrierText extends TextView {