Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fb97220 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 3550c6c5: am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition... 

am 3550c6c5: am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

* commit '3550c6c5':
  AAPT: Add custom transition classes to Proguard keep set
parents 7048518e 3550c6c5

tools/aapt/Resource.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -3016,6 +3016,8 @@ status_t 
writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)

writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)

{

{

    status_t err;

    status_t err;

    const String8 kTransition("transition");

    const String8 kTransitionPrefix("transition-");





    // tag:attribute pairs that should be checked in layout files.

    // tag:attribute pairs that should be checked in layout files.

    KeyedVector<String8, Vector<NamespaceAttributePair> > kLayoutTagAttrPairs;

    KeyedVector<String8, Vector<NamespaceAttributePair> > kLayoutTagAttrPairs;
@@ -3028,6 +3030,10 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) 
    addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment");

    addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment");

    addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment");

    addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment");





    // tag:attribute pairs that should be checked in transition files.

    KeyedVector<String8, Vector<NamespaceAttributePair> > kTransitionTagAttrPairs;

    addTagAttrPair(&kTransitionTagAttrPairs, kTransition.string(), NULL, "class");



    const Vector<sp<AaptDir> >& dirs = assets->resDirs();

    const Vector<sp<AaptDir> >& dirs = assets->resDirs();

    const size_t K = dirs.size();

    const size_t K = dirs.size();

    for (size_t k=0; k<K; k++) {

    for (size_t k=0; k<K; k++) {
@@ -3045,6 +3051,9 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) 
        } else if ((dirName == String8("menu")) || (strncmp(dirName.string(), "menu-", 5) == 0)) {

        } else if ((dirName == String8("menu")) || (strncmp(dirName.string(), "menu-", 5) == 0)) {

            startTags.add(String8("menu"));

            startTags.add(String8("menu"));

            tagAttrPairs = NULL;

            tagAttrPairs = NULL;

        } else if (dirName == kTransition || (strncmp(dirName.string(), kTransitionPrefix.string(),

                        kTransitionPrefix.size()) == 0)) {

            tagAttrPairs = &kTransitionTagAttrPairs;

        } else {

        } else {

            continue;

            continue;

        }

        }