Merge branch 'handsomejun' of https://git.trustie.net/lileilei/group_fighting
handsomejun/code-1/LoginActivity.java handsomejun/code-1/func_page.java handsomejun/code-1/get_goods.java handsomejun/code-1/goods_2_page.java handsomejun/code-1/locate_page.java handsomejun/code-1/my_address_page.java handsomejun/code-1/register_page.java
This commit is contained in:
zdj
commit
ace7505b81
Binary file not shown.
|
After Width: | Height: | Size: 204 KiB |
|
|
@ -0,0 +1 @@
|
|||
#Wed Aug 30 19:34:01 CST 2017
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CheckStyle-IDEA">
|
||||
<option name="configuration">
|
||||
<map>
|
||||
<entry key="checkstyle-version" value="8.2" />
|
||||
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
|
||||
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
|
||||
<entry key="scan-before-checkin" value="false" />
|
||||
<entry key="scanscope" value="JavaOnly" />
|
||||
<entry key="suppress-errors" value="false" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<resourceExtensions />
|
||||
<wildcardResourcePatterns>
|
||||
<entry name="!?*.java" />
|
||||
<entry name="!?*.form" />
|
||||
<entry name="!?*.class" />
|
||||
<entry name="!?*.groovy" />
|
||||
<entry name="!?*.scala" />
|
||||
<entry name="!?*.flex" />
|
||||
<entry name="!?*.kt" />
|
||||
<entry name="!?*.clj" />
|
||||
<entry name="!?*.aj" />
|
||||
</wildcardResourcePatterns>
|
||||
<annotationProcessing>
|
||||
<profile default="true" name="Default" enabled="false">
|
||||
<processorPath useClasspath="true" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
<component name="CopyrightManager">
|
||||
<settings default="" />
|
||||
</component>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="NullableNotNullManager">
|
||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
<option name="myNullables">
|
||||
<value>
|
||||
<list size="4">
|
||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
|
||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
|
||||
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
|
||||
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
<option name="myNotNulls">
|
||||
<value>
|
||||
<list size="4">
|
||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
|
||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
|
||||
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
|
||||
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
<OptionsSetting value="true" id="Remove" />
|
||||
<OptionsSetting value="true" id="Checkout" />
|
||||
<OptionsSetting value="true" id="Update" />
|
||||
<OptionsSetting value="true" id="Status" />
|
||||
<OptionsSetting value="true" id="Edit" />
|
||||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
<state key="ProjectJDKs.UI">
|
||||
<settings>
|
||||
<last-edited>1.8</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
</states>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/Notes-master-original.iml" filepath="$PROJECT_DIR$/Notes-master-original.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RunConfigurationProducerService">
|
||||
<option name="ignoredProducers">
|
||||
<set>
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id="Notes-master-original" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="java-gradle" name="Java-Gradle">
|
||||
<configuration>
|
||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||
<option name="BUILDABLE" value="false" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id="Notes-master1" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="java-gradle" name="Java-Gradle">
|
||||
<configuration>
|
||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||
<option name="BUILDABLE" value="false" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 18
|
||||
buildToolsVersion "26.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.micode.notes"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 14
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package net.micode.notes.test;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String APPLICATION_ID = "net.micode.notes.test";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = -1;
|
||||
public static final String VERSION_NAME = "";
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package net.micode.notes;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String APPLICATION_ID = "net.micode.notes";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = 1;
|
||||
public static final String VERSION_NAME = "0.1";
|
||||
}
|
||||
|
|
@ -0,0 +1,328 @@
|
|||
/* AUTO-GENERATED FILE. DO NOT MODIFY.
|
||||
*
|
||||
* This class was automatically generated by the
|
||||
* aapt tool from the resource data it found. It
|
||||
* should not be modified by hand.
|
||||
*/
|
||||
|
||||
package net.micode.notes;
|
||||
|
||||
public final class R {
|
||||
public static final class array {
|
||||
/** format_note_content
|
||||
*/
|
||||
public static final int format_for_exported_note=0x7f060001;
|
||||
public static final int menu_share_ways=0x7f060000;
|
||||
}
|
||||
public static final class attr {
|
||||
}
|
||||
public static final class color {
|
||||
public static final int primary_text_dark=0x7f090001;
|
||||
public static final int secondary_text_dark=0x7f090002;
|
||||
public static final int user_query_highlight=0x7f090000;
|
||||
}
|
||||
public static final class dimen {
|
||||
public static final int text_font_size_large=0x7f0a0000;
|
||||
public static final int text_font_size_medium=0x7f0a0001;
|
||||
public static final int text_font_size_normal=0x7f0a0002;
|
||||
public static final int text_font_size_small=0x7f0a0003;
|
||||
public static final int text_font_size_super=0x7f0a0004;
|
||||
}
|
||||
public static final class drawable {
|
||||
public static final int bg_btn_set_color=0x7f020000;
|
||||
public static final int bg_color_btn_mask=0x7f020001;
|
||||
public static final int call_record=0x7f020002;
|
||||
public static final int clock=0x7f020003;
|
||||
public static final int delete=0x7f020004;
|
||||
public static final int dropdown_icon=0x7f020005;
|
||||
public static final int edit_blue=0x7f020006;
|
||||
public static final int edit_green=0x7f020007;
|
||||
public static final int edit_red=0x7f020008;
|
||||
public static final int edit_title_blue=0x7f020009;
|
||||
public static final int edit_title_green=0x7f02000a;
|
||||
public static final int edit_title_red=0x7f02000b;
|
||||
public static final int edit_title_white=0x7f02000c;
|
||||
public static final int edit_title_yellow=0x7f02000d;
|
||||
public static final int edit_white=0x7f02000e;
|
||||
public static final int edit_yellow=0x7f02000f;
|
||||
public static final int font_large=0x7f020010;
|
||||
public static final int font_normal=0x7f020011;
|
||||
public static final int font_size_selector_bg=0x7f020012;
|
||||
public static final int font_small=0x7f020013;
|
||||
public static final int font_super=0x7f020014;
|
||||
public static final int icon_app=0x7f020015;
|
||||
public static final int list_background=0x7f020016;
|
||||
public static final int list_blue_down=0x7f020017;
|
||||
public static final int list_blue_middle=0x7f020018;
|
||||
public static final int list_blue_single=0x7f020019;
|
||||
public static final int list_blue_up=0x7f02001a;
|
||||
public static final int list_folder=0x7f02001b;
|
||||
public static final int list_footer_bg=0x7f02001c;
|
||||
public static final int list_green_down=0x7f02001d;
|
||||
public static final int list_green_middle=0x7f02001e;
|
||||
public static final int list_green_single=0x7f02001f;
|
||||
public static final int list_green_up=0x7f020020;
|
||||
public static final int list_red_down=0x7f020021;
|
||||
public static final int list_red_middle=0x7f020022;
|
||||
public static final int list_red_single=0x7f020023;
|
||||
public static final int list_red_up=0x7f020024;
|
||||
public static final int list_white_down=0x7f020025;
|
||||
public static final int list_white_middle=0x7f020026;
|
||||
public static final int list_white_single=0x7f020027;
|
||||
public static final int list_white_up=0x7f020028;
|
||||
public static final int list_yellow_down=0x7f020029;
|
||||
public static final int list_yellow_middle=0x7f02002a;
|
||||
public static final int list_yellow_single=0x7f02002b;
|
||||
public static final int list_yellow_up=0x7f02002c;
|
||||
public static final int menu_delete=0x7f02002d;
|
||||
public static final int menu_move=0x7f02002e;
|
||||
public static final int new_note=0x7f02002f;
|
||||
public static final int new_note_normal=0x7f020030;
|
||||
public static final int new_note_pressed=0x7f020031;
|
||||
public static final int note_edit_color_selector_panel=0x7f020032;
|
||||
public static final int notification=0x7f020033;
|
||||
public static final int search_result=0x7f020034;
|
||||
public static final int selected=0x7f020035;
|
||||
public static final int splash=0x7f020036;
|
||||
public static final int title_alert=0x7f020037;
|
||||
public static final int title_bar_bg=0x7f020038;
|
||||
public static final int widget_2x_blue=0x7f020039;
|
||||
public static final int widget_2x_green=0x7f02003a;
|
||||
public static final int widget_2x_red=0x7f02003b;
|
||||
public static final int widget_2x_white=0x7f02003c;
|
||||
public static final int widget_2x_yellow=0x7f02003d;
|
||||
public static final int widget_4x_blue=0x7f02003e;
|
||||
public static final int widget_4x_green=0x7f02003f;
|
||||
public static final int widget_4x_red=0x7f020040;
|
||||
public static final int widget_4x_white=0x7f020041;
|
||||
public static final int widget_4x_yellow=0x7f020042;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int account_dialog_subtitle=0x7f0d0001;
|
||||
public static final int account_dialog_title=0x7f0d0000;
|
||||
public static final int action_select_all=0x7f0d0042;
|
||||
public static final int amPm=0x7f0d0005;
|
||||
public static final int btn_new_note=0x7f0d002d;
|
||||
public static final int btn_set_bg_color=0x7f0d000f;
|
||||
public static final int cb_edit_item=0x7f0d0024;
|
||||
public static final int date=0x7f0d0002;
|
||||
public static final int delete=0x7f0d0044;
|
||||
public static final int et_edit_text=0x7f0d0025;
|
||||
public static final int et_foler_name=0x7f0d0006;
|
||||
public static final int font_size_selector=0x7f0d001b;
|
||||
public static final int gestureOverlayView=0x7f0d002b;
|
||||
public static final int hour=0x7f0d0003;
|
||||
public static final int iv_alert_icon=0x7f0d000a;
|
||||
public static final int iv_bg_blue=0x7f0d0013;
|
||||
public static final int iv_bg_blue_select=0x7f0d0014;
|
||||
public static final int iv_bg_green=0x7f0d0017;
|
||||
public static final int iv_bg_green_select=0x7f0d0018;
|
||||
public static final int iv_bg_red=0x7f0d0019;
|
||||
public static final int iv_bg_red_select=0x7f0d001a;
|
||||
public static final int iv_bg_white=0x7f0d0015;
|
||||
public static final int iv_bg_white_select=0x7f0d0016;
|
||||
public static final int iv_bg_yellow=0x7f0d0011;
|
||||
public static final int iv_bg_yellow_select=0x7f0d0012;
|
||||
public static final int iv_large_select=0x7f0d0021;
|
||||
public static final int iv_medium_select=0x7f0d001f;
|
||||
public static final int iv_small_select=0x7f0d001d;
|
||||
public static final int iv_super_select=0x7f0d0023;
|
||||
public static final int ll_font_large=0x7f0d0020;
|
||||
public static final int ll_font_normal=0x7f0d001e;
|
||||
public static final int ll_font_small=0x7f0d001c;
|
||||
public static final int ll_font_super=0x7f0d0022;
|
||||
public static final int menu_alert=0x7f0d003a;
|
||||
public static final int menu_delete=0x7f0d0035;
|
||||
public static final int menu_delete_remind=0x7f0d003b;
|
||||
public static final int menu_export_text=0x7f0d003f;
|
||||
public static final int menu_font_size=0x7f0d0036;
|
||||
public static final int menu_list_mode=0x7f0d0037;
|
||||
public static final int menu_new_folder=0x7f0d003e;
|
||||
public static final int menu_new_note=0x7f0d003d;
|
||||
public static final int menu_search=0x7f0d003c;
|
||||
public static final int menu_send_to_desktop=0x7f0d0039;
|
||||
public static final int menu_setting=0x7f0d0041;
|
||||
public static final int menu_share=0x7f0d0038;
|
||||
public static final int menu_sync=0x7f0d0040;
|
||||
public static final int minute=0x7f0d0004;
|
||||
public static final int move=0x7f0d0043;
|
||||
public static final int navigation_bar=0x7f0d002e;
|
||||
public static final int note_bg_color_selector=0x7f0d0010;
|
||||
public static final int note_edit_list=0x7f0d000e;
|
||||
public static final int note_edit_view=0x7f0d000d;
|
||||
public static final int note_item=0x7f0d0026;
|
||||
public static final int note_title=0x7f0d0008;
|
||||
public static final int notes_list=0x7f0d002c;
|
||||
public static final int prefenerece_sync_status_textview=0x7f0d0031;
|
||||
public static final int preference_sync_button=0x7f0d0030;
|
||||
public static final int selection_menu=0x7f0d002f;
|
||||
public static final int sv_note_edit=0x7f0d000c;
|
||||
public static final int tv_alert_date=0x7f0d000b;
|
||||
public static final int tv_folder_name=0x7f0d0007;
|
||||
public static final int tv_modified_date=0x7f0d0009;
|
||||
public static final int tv_name=0x7f0d0027;
|
||||
public static final int tv_time=0x7f0d0029;
|
||||
public static final int tv_title=0x7f0d0028;
|
||||
public static final int tv_title_bar=0x7f0d002a;
|
||||
public static final int versionNumber=0x7f0d0032;
|
||||
public static final int widget_bg_image=0x7f0d0033;
|
||||
public static final int widget_text=0x7f0d0034;
|
||||
}
|
||||
public static final class layout {
|
||||
public static final int account_dialog_title=0x7f030000;
|
||||
public static final int add_account_text=0x7f030001;
|
||||
public static final int datetime_picker=0x7f030002;
|
||||
public static final int dialog_edit_text=0x7f030003;
|
||||
public static final int folder_list_item=0x7f030004;
|
||||
public static final int note_edit=0x7f030005;
|
||||
public static final int note_edit_list_item=0x7f030006;
|
||||
public static final int note_item=0x7f030007;
|
||||
public static final int note_list=0x7f030008;
|
||||
public static final int note_list_dropdown_menu=0x7f030009;
|
||||
public static final int note_list_footer=0x7f03000a;
|
||||
public static final int settings_header=0x7f03000b;
|
||||
public static final int splash=0x7f03000c;
|
||||
public static final int widget_2x=0x7f03000d;
|
||||
public static final int widget_4x=0x7f03000e;
|
||||
}
|
||||
public static final class menu {
|
||||
public static final int call_note_edit=0x7f0c0000;
|
||||
public static final int call_record_folder=0x7f0c0001;
|
||||
public static final int note_edit=0x7f0c0002;
|
||||
public static final int note_list=0x7f0c0003;
|
||||
public static final int note_list_dropdown=0x7f0c0004;
|
||||
public static final int note_list_options=0x7f0c0005;
|
||||
public static final int sub_folder=0x7f0c0006;
|
||||
}
|
||||
public static final class plurals {
|
||||
public static final int search_results_title=0x7f070000;
|
||||
}
|
||||
public static final class raw {
|
||||
public static final int gestures=0x7f050000;
|
||||
public static final int introduction=0x7f050001;
|
||||
}
|
||||
public static final class string {
|
||||
public static final int alert_message_delete_folder=0x7f080000;
|
||||
public static final int alert_message_delete_note=0x7f080001;
|
||||
public static final int alert_message_delete_notes=0x7f080002;
|
||||
public static final int alert_title_delete=0x7f080003;
|
||||
public static final int app_name=0x7f080004;
|
||||
public static final int app_widget2x2=0x7f080005;
|
||||
public static final int app_widget4x4=0x7f080006;
|
||||
public static final int button_delete=0x7f080007;
|
||||
public static final int call_record_folder_name=0x7f080008;
|
||||
public static final int datetime_dialog_cancel=0x7f080009;
|
||||
public static final int datetime_dialog_ok=0x7f08000a;
|
||||
public static final int delete_remind_time_message=0x7f08000b;
|
||||
public static final int error_note_empty_for_clock=0x7f08000c;
|
||||
public static final int error_note_empty_for_send_to_desktop=0x7f08000d;
|
||||
public static final int error_note_not_exist=0x7f08000e;
|
||||
public static final int error_sdcard_export=0x7f08000f;
|
||||
public static final int error_sdcard_unmounted=0x7f080010;
|
||||
public static final int error_sync_cancelled=0x7f080011;
|
||||
public static final int error_sync_internal=0x7f080012;
|
||||
public static final int error_sync_network=0x7f080013;
|
||||
public static final int failed_sdcard_export=0x7f080014;
|
||||
public static final int file_name_txt_format=0x7f080062;
|
||||
public static final int file_path=0x7f080063;
|
||||
public static final int folder_exist=0x7f080015;
|
||||
public static final int format_date_ymd=0x7f080016;
|
||||
public static final int format_datetime_mdhm=0x7f080017;
|
||||
public static final int format_exported_file_location=0x7f080018;
|
||||
public static final int format_folder_files_count=0x7f080064;
|
||||
public static final int format_move_notes_to_folder=0x7f080019;
|
||||
public static final int hint_foler_name=0x7f08001a;
|
||||
public static final int info_note_enter_desktop=0x7f08001b;
|
||||
public static final int menu_alert=0x7f08001c;
|
||||
public static final int menu_create_folder=0x7f08001d;
|
||||
public static final int menu_delete=0x7f08001e;
|
||||
public static final int menu_deselect_all=0x7f08001f;
|
||||
public static final int menu_export_text=0x7f080020;
|
||||
public static final int menu_folder_change_name=0x7f080021;
|
||||
public static final int menu_folder_delete=0x7f080022;
|
||||
public static final int menu_folder_view=0x7f080023;
|
||||
public static final int menu_font_large=0x7f080024;
|
||||
public static final int menu_font_normal=0x7f080025;
|
||||
public static final int menu_font_size=0x7f080026;
|
||||
public static final int menu_font_small=0x7f080027;
|
||||
public static final int menu_font_super=0x7f080028;
|
||||
public static final int menu_list_mode=0x7f080029;
|
||||
public static final int menu_move=0x7f08002a;
|
||||
public static final int menu_move_parent_folder=0x7f08002b;
|
||||
public static final int menu_normal_mode=0x7f08002c;
|
||||
public static final int menu_remove_remind=0x7f08002d;
|
||||
public static final int menu_search=0x7f08002e;
|
||||
public static final int menu_select_all=0x7f08002f;
|
||||
public static final int menu_select_none=0x7f080030;
|
||||
public static final int menu_select_title=0x7f080031;
|
||||
public static final int menu_send_to_desktop=0x7f080032;
|
||||
public static final int menu_setting=0x7f080033;
|
||||
public static final int menu_share=0x7f080034;
|
||||
public static final int menu_sync=0x7f080035;
|
||||
public static final int menu_sync_cancel=0x7f080036;
|
||||
public static final int menu_title_select_folder=0x7f080037;
|
||||
public static final int note_alert_expired=0x7f080038;
|
||||
public static final int note_link_email=0x7f080039;
|
||||
public static final int note_link_other=0x7f08003a;
|
||||
public static final int note_link_tel=0x7f08003b;
|
||||
public static final int note_link_web=0x7f08003c;
|
||||
public static final int notealert_enter=0x7f08003d;
|
||||
public static final int notealert_ok=0x7f08003e;
|
||||
public static final int notelist_menu_new=0x7f08003f;
|
||||
public static final int notelist_string_info=0x7f080040;
|
||||
public static final int preferences_account_summary=0x7f080041;
|
||||
public static final int preferences_account_title=0x7f080042;
|
||||
public static final int preferences_add_account=0x7f080043;
|
||||
public static final int preferences_bg_random_appear_title=0x7f080044;
|
||||
public static final int preferences_button_sync_cancel=0x7f080045;
|
||||
public static final int preferences_button_sync_immediately=0x7f080046;
|
||||
public static final int preferences_dialog_change_account_title=0x7f080047;
|
||||
public static final int preferences_dialog_change_account_warn_msg=0x7f080048;
|
||||
public static final int preferences_dialog_select_account_tips=0x7f080049;
|
||||
public static final int preferences_dialog_select_account_title=0x7f08004a;
|
||||
public static final int preferences_last_sync_time=0x7f08004b;
|
||||
public static final int preferences_last_sync_time_format=0x7f080065;
|
||||
public static final int preferences_menu_cancel=0x7f08004c;
|
||||
public static final int preferences_menu_change_account=0x7f08004d;
|
||||
public static final int preferences_menu_remove_account=0x7f08004e;
|
||||
public static final int preferences_title=0x7f08004f;
|
||||
public static final int preferences_toast_cannot_change_account=0x7f080050;
|
||||
public static final int preferences_toast_success_set_accout=0x7f080051;
|
||||
public static final int search=0x7f080052;
|
||||
public static final int search_hint=0x7f080053;
|
||||
public static final int search_label=0x7f080054;
|
||||
public static final int search_setting_description=0x7f080055;
|
||||
public static final int set_remind_time_message=0x7f080056;
|
||||
public static final int success_sdcard_export=0x7f080057;
|
||||
public static final int success_sync_account=0x7f080058;
|
||||
public static final int sync_progress_init_list=0x7f080059;
|
||||
public static final int sync_progress_login=0x7f08005a;
|
||||
public static final int sync_progress_syncing=0x7f08005b;
|
||||
public static final int ticker_cancel=0x7f08005c;
|
||||
public static final int ticker_fail=0x7f08005d;
|
||||
public static final int ticker_success=0x7f08005e;
|
||||
public static final int ticker_syncing=0x7f08005f;
|
||||
public static final int widget_havenot_content=0x7f080060;
|
||||
public static final int widget_under_visit_mode=0x7f080061;
|
||||
}
|
||||
public static final class style {
|
||||
public static final int HighlightTextAppearancePrimary=0x7f0b0000;
|
||||
public static final int HighlightTextAppearanceSecondary=0x7f0b0001;
|
||||
public static final int NoteActionBarStyle=0x7f0b0002;
|
||||
public static final int NoteTheme=0x7f0b0003;
|
||||
public static final int TextAppearanceLarge=0x7f0b0004;
|
||||
public static final int TextAppearanceMedium=0x7f0b0005;
|
||||
public static final int TextAppearanceNormal=0x7f0b0006;
|
||||
public static final int TextAppearancePrimaryItem=0x7f0b0007;
|
||||
public static final int TextAppearanceSecondaryItem=0x7f0b0008;
|
||||
public static final int TextAppearanceSuper=0x7f0b0009;
|
||||
public static final int TextAppearanceUnderMenuIcon=0x7f0b000a;
|
||||
public static final int TitleBarTextView=0x7f0b000b;
|
||||
}
|
||||
public static final class xml {
|
||||
public static final int preferences=0x7f040000;
|
||||
public static final int searchable=0x7f040001;
|
||||
public static final int widget_2x_info=0x7f040002;
|
||||
public static final int widget_4x_info=0x7f040003;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,10 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\color\\secondary_text_dark.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\color\\primary_text_dark.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\color\\primary_text_dark.xml"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,266 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_middle.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_yellow.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_blue.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_down.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\call_record.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_red.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_yellow.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_single.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_green.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_up.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_white.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\delete.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\splash.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\splash.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_folder.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_yellow.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_up.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_single.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_middle.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_green.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\new_note_pressed.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\clock.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_down.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_footer_bg.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_green.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_blue.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_yellow.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_green.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_white.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_blue.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_super.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_up.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_red.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_up.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_red.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\title_bar_bg.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_single.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\dropdown_icon.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_small.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_middle.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_down.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_single.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_size_selector_bg.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_normal.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_down.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_blue.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\new_note_normal.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bg_color_btn_mask.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_white.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_app.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_white.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_up.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_down.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_single.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\menu_move.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_middle.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_middle.9.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\menu_delete.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_background.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bg_btn_set_color.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_large.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\search_result.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_red.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\title_alert.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\notification.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\note_edit_color_selector_panel.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\selected.png",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\new_note.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable\\new_note.xml"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\settings_header.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\settings_header.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\account_dialog_title.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_edit.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\widget_4x.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\widget_4x.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\add_account_text.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\add_account_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\datetime_picker.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\datetime_picker.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_edit_text.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list_dropdown_menu.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list_footer.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list_footer.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_edit_list_item.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\folder_list_item.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\folder_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\splash.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\splash.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_item.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\widget_2x.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\widget_2x.xml"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\call_record_folder.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\call_record_folder.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\call_note_edit.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\call_note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_edit.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list_dropdown.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\sub_folder.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\sub_folder.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list_options.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list_options.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list.xml"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN\\introduction",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw\\gestures",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw\\gestures"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw\\introduction",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw\\introduction"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
[
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\preferences.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\preferences.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\widget_2x_info.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\widget_4x_info.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\searchable.xml",
|
||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\searchable.xml"
|
||||
}
|
||||
]
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue