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

Commit e4437ddf authored by d34d's avatar d34d Committed by Gerrit Code Review
Browse files

Themes: Create data/cm/ for CM specific test data 

Change-Id: I523845be1bf2cbe1c2f01fc1cb0e7d2a9d8ef1e1
parent b96f7c2a

libs/androidfw/tests/PackageIdOverride_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <utils/String8.h>

#include <utils/String16.h>

#include "TestHelpers.h"

#include "data/override/R.h"

#include "data/cm/override/R.h"



#include <gtest/gtest.h>
@@ -28,7 +28,7 @@ using namespace android; 


namespace {



#include "data/override/override_arsc.h"

#include "data/cm/override/override_arsc.h"



TEST(PackageIdOverrideTest, shouldOverridePackageId) {

    const uint32_t pkgIdOverride = 0x42;

libs/androidfw/tests/ThemesBags_test.cpp

+6 −6
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <utils/String8.h>

#include <utils/String16.h>

#include "TestHelpers.h"

#include "data/system/R.h"

#include "data/app/R.h"

#include "data/bags/R.h"

#include "data/cm/system/R.h"

#include "data/cm/app/R.h"

#include "data/cm/bags/R.h"



#include <gtest/gtest.h>
@@ -34,14 +34,14 @@ namespace { 
 *

 * Package: android

 */

#include "data/system/system_arsc.h"

#include "data/cm/system/system_arsc.h"



/**

 * Include a binary resource table.

 *

 * Package: com.android.app

 */

#include "data/app/app_arsc.h"

#include "data/cm/app/app_arsc.h"



/**

 * Include a binary resource table.
@@ -49,7 +49,7 @@ namespace { 
 *

 * Package: com.android.test.bags

 */

#include "data/bags/bags_arsc.h"

#include "data/cm/bags/bags_arsc.h"



enum { MAY_NOT_BE_BAG = false };

libs/androidfw/tests/ThemesIdmap_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <utils/String8.h>

#include <utils/String16.h>

#include "TestHelpers.h"

#include "data/basic/R.h"

#include "data/cm/basic/R.h"



#include <gtest/gtest.h>
@@ -32,7 +32,7 @@ namespace { 
 *

 * Package: com.android.test.basic

 */

#include "data/basic/basic_arsc.h"

#include "data/cm/basic/basic_arsc.h"



/**

 * Include a binary resource table.
@@ -40,7 +40,7 @@ namespace { 
 *

 * Package: com.android.test.basic

 */

#include "data/overlay/overlay_arsc.h"

#include "data/cm/overlay/overlay_arsc.h"



enum { MAY_NOT_BE_BAG = false };

libs/androidfw/tests/data/cm/app/AndroidManifest.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.app">

</manifest>

libs/androidfw/tests/data/cm/app/R.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#ifndef __APP_R_H

#define __APP_R_H



namespace app {

namespace R {



namespace attr {

    enum {

        number         = 0x7f010000,   // default

    };

}



namespace style {

    enum {

        Theme_One      = 0x7f020000,   // default

        Theme_Two      = 0x7f020001,   // default

        Theme_Three    = 0x7f020002,   // default

        Theme_Four     = 0x7f020003,   // default

    };

}



namespace color {

    enum {

        app_color    = 0x7f030000,   // default

    };

}



} // namespace R

} // namespace app



#endif // __APP_R_H