Skip to content

fix: Move conflicting Android classes to a different package #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inotia00 merged 1 commit into from
Dec 5, 2025
Merged

fix: Move conflicting Android classes to a different package #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ndroid/content/res/XmlResourceParser.java → ...pktool/content/res/XmlResourceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.content.res;
package app.morphe.apktool.content.res;

import android.util.AttributeSet;
import app.morphe.apktool.util.AttributeSet;
import org.xmlpull.v1.XmlPullParser;

/**
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/android/util/AttributeSet.java → ...app/morphe/apktool/util/AttributeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.util;
package app.morphe.apktool.util;

/**
* A collection of attributes, as found associated with a tag in an XML
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/android/util/TypedValue.java → ...a/app/morphe/apktool/util/TypedValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.util;
package app.morphe.apktool.util;

/**
* Container for a dynamically typed data value. Primarily used with
Expand Down
3 changes: 1 addition & 2 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryResourceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
*/
package brut.androlib.res.decoder;

import android.util.TypedValue;
import app.morphe.apktool.util.TypedValue;
import brut.androlib.Config;
import brut.androlib.exceptions.AndrolibException;
import brut.androlib.exceptions.UndefinedResObjectException;
import brut.androlib.meta.ApkInfo;
import brut.androlib.res.decoder.data.FlagsOffset;
import brut.androlib.res.decoder.data.ResChunkHeader;
import brut.androlib.res.decoder.data.ResStringPool;
Expand Down
6 changes: 2 additions & 4 deletions ....apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryXmlResourceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package brut.androlib.res.decoder;

import android.content.res.XmlResourceParser;
import android.util.TypedValue;
import app.morphe.apktool.content.res.XmlResourceParser;
import app.morphe.apktool.util.TypedValue;
import brut.androlib.exceptions.AndrolibException;
import brut.androlib.exceptions.FrameworkNotFoundException;
import brut.androlib.exceptions.UndefinedResObjectException;
Expand All @@ -32,9 +32,7 @@

import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Reader;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
Expand Down
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package brut.androlib.res.table.value;

import android.util.TypedValue;
import app.morphe.apktool.util.TypedValue;
import brut.androlib.res.table.ResId;
import brut.androlib.res.table.ResPackage;
import com.google.common.collect.Sets;
Expand Down
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResPrimitive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package brut.androlib.res.table.value;

import android.util.TypedValue;
import app.morphe.apktool.util.TypedValue;
import brut.androlib.exceptions.AndrolibException;
import brut.androlib.res.table.ResEntry;
import brut.androlib.res.xml.ResXmlEncodable;
Expand Down
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package brut.androlib.res.xml;

import android.util.TypedValue;
import app.morphe.apktool.util.TypedValue;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;

Expand Down