aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Gaillard <jgaillard@google.com>2020-05-18 13:24:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 13:24:47 +0000
commite9b4b8c2e2ce85ba56ee26e9cfa0b5c2d02482ed (patch)
treea7fcb33a7205c17d73502461d75571fedd6d731d
parentb643d07b96b843591023abf2c162f531a60ad1fa (diff)
parente18a978f9df672a169b45bfaae603d52d9bca8f5 (diff)
downloadlayoutlib-e9b4b8c2e2ce85ba56ee26e9cfa0b5c2d02482ed.tar.gz
Merge "Use bug to track all namespace related TODOs" into rvc-dev am: e18a978f9d
Change-Id: I64d68464058464e0fa057f9b33dd6c02b3a5e39f
-rw-r--r--bridge/src/android/graphics/Typeface_Delegate.java2
-rw-r--r--bridge/src/android/util/BridgeXmlPullAttributes.java2
-rw-r--r--bridge/src/com/android/layoutlib/bridge/Bridge.java2
-rw-r--r--bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java4
-rw-r--r--bridge/src/com/android/layoutlib/bridge/resources/SysUiResources.java2
5 files changed, 6 insertions, 6 deletions
diff --git a/bridge/src/android/graphics/Typeface_Delegate.java b/bridge/src/android/graphics/Typeface_Delegate.java
index 35146f46f7..fb044d95da 100644
--- a/bridge/src/android/graphics/Typeface_Delegate.java
+++ b/bridge/src/android/graphics/Typeface_Delegate.java
@@ -257,7 +257,7 @@ public final class Typeface_Delegate {
}
if (parser != null) {
- // TODO(namespaces): The aapt namespace should not matter for parsing font files?
+ // TODO(b/156609434): The aapt namespace should not matter for parsing font files?
BridgeXmlBlockParser blockParser =
new BridgeXmlBlockParser(
parser, context, ResourceNamespace.fromBoolean(isFramework));
diff --git a/bridge/src/android/util/BridgeXmlPullAttributes.java b/bridge/src/android/util/BridgeXmlPullAttributes.java
index 72a61f91c1..8a78fa3843 100644
--- a/bridge/src/android/util/BridgeXmlPullAttributes.java
+++ b/bridge/src/android/util/BridgeXmlPullAttributes.java
@@ -104,7 +104,7 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes implements Resolv
return Bridge.getResourceId(ResourceType.ATTR, name);
}
- // TODO(namespaces): cache the namespace objects.
+ // TODO(b/156609434): cache the namespace objects.
ResourceNamespace namespace = ResourceNamespace.fromNamespaceUri(ns);
if (namespace != null) {
return mContext.getLayoutlibCallback().getOrGenerateResourceId(
diff --git a/bridge/src/com/android/layoutlib/bridge/Bridge.java b/bridge/src/com/android/layoutlib/bridge/Bridge.java
index 8323a00f7f..7632b2e015 100644
--- a/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -542,7 +542,7 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
/**
* Returns details of a framework resource from its integer value.
*
- * <p>TODO(namespaces): remove this and just do all id resolution through the callback.
+ * <p>TODO(b/156609434): remove this and just do all id resolution through the callback.
*/
@Nullable
public static ResourceReference resolveResourceId(int value) {
diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 67f7c44a3d..e1e61508a9 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1096,7 +1096,7 @@ public class BridgeContext extends Context {
* Maps a given style to a numeric id.
*
* <p>For now Bridge handles numeric ids (both fixed and dynamic) for framework and the callback
- * for non-framework. TODO(namespaces): teach the IDE about fixed framework ids and handle this
+ * for non-framework. TODO(b/156609434): teach the IDE about fixed framework ids and handle this
* all in the callback.
*/
public int getDynamicIdByStyle(StyleResourceValue resValue) {
@@ -1111,7 +1111,7 @@ public class BridgeContext extends Context {
* Maps a numeric id back to {@link StyleResourceValue}.
*
* <p>For now framework numeric ids are handled by Bridge, so try there first and fall back to
- * the callback, which manages ids for non-framework resources. TODO(namespaces): manage all
+ * the callback, which manages ids for non-framework resources. TODO(b/156609434): manage all
* ids in the IDE.
*
* <p>Once we the resource for the given id, we ask the IDE to get the
diff --git a/bridge/src/com/android/layoutlib/bridge/resources/SysUiResources.java b/bridge/src/com/android/layoutlib/bridge/resources/SysUiResources.java
index 96a6e344ec..d84b411367 100644
--- a/bridge/src/com/android/layoutlib/bridge/resources/SysUiResources.java
+++ b/bridge/src/com/android/layoutlib/bridge/resources/SysUiResources.java
@@ -52,7 +52,7 @@ public class SysUiResources {
try {
XmlPullParser parser = ParserFactory.create(stream, layoutName);
- // TODO(namespaces): does the namespace matter here?
+ // TODO(b/156609434): does the namespace matter here?
return new BridgeXmlBlockParser(parser, context, PRIVATE_LAYOUTLIB_NAMESPACE);
} catch (XmlPullParserException e) {
// Should not happen as the resource is bundled with the jar, and ParserFactory should