最终结果 #42

Merged
p5i4afnyx merged 6 commits from a_branch into dev 8 months ago

@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Gradle: D" external-system-id="GRADLE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/platforms/android-34/optional/org.apache.http.legacy.jar!/" />
<root url="jar://D:/ASSDK/platforms/android-34/optional/org.apache.http.legacy.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">

@ -18,7 +18,6 @@
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug">

@ -1,4 +1,4 @@
#Sat Jan 11 23:16:31 CST 2025
#Tue Jan 14 03:32:27 CST 2025
net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat

@ -284,7 +284,7 @@
<string name="call_record_folder_name">Call notes</string>
<string name="datetime_dialog_cancel">cancel</string>
<string name="datetime_dialog_ok">set</string>
<string name="day_time">light mode</string>
<string name="day_time">Light Mode</string>
<string name="delete_remind_time_message">Delete reminder successfully</string>
<string name="dummy_button">Dummy Button</string>
<string name="dummy_content">HELLO\nWORLD!!!</string>
@ -319,17 +319,17 @@
<string name="menu_font_normal">Medium</string>
<string name="menu_font_size">Font size</string>
<string name="menu_font_small">Small</string>
<string name="menu_font_style">Select font</string>
<string name="menu_font_style">Select Font</string>
<string name="menu_font_super">Super</string>
<string name="menu_list_mode">Enter check list</string>
<string name="menu_move">Move to folder</string>
<string name="menu_move_parent_folder">Parent folder</string>
<string name="menu_normal_mode">Leave check list</string>
<string name="menu_quit_secret">quit secret model</string>
<string name="menu_quit_secret">Quit Secret Model</string>
<string name="menu_remove_remind">Delete reminder</string>
<string name="menu_search">Search</string>
<string name="menu_search_text">search_text</string>
<string name="menu_secret">secret model</string>
<string name="menu_search_text">Search Text</string>
<string name="menu_secret">Secret Model</string>
<string name="menu_select_all">Select all</string>
<string name="menu_select_none">Nothing selected, the operation is invalid</string>
<string name="menu_select_title">%d selected</string>
@ -340,7 +340,7 @@
<string name="menu_sync_cancel">Cancel syncing</string>
<string name="menu_title_select_folder">Select folder</string>
<string name="menu_trash">Trash Folder</string>
<string name="night_time">night mode</string>
<string name="night_time">Night Mode</string>
<string name="note_alert_expired">Expired</string>
<string name="note_length">Length</string>
<string name="note_link_email">Send email</string>
@ -1915,11 +1915,11 @@
<declare-styleable name="ActionBar">
<attr name="navigationMode">
<!-- Normal static title text -->
<enum name="normal" value="0"/>
<!-- The action bar will use a selection list for navigation. -->
<enum name="listMode" value="1"/>
<!-- The action bar will use a series of horizontal tabs for navigation. -->
<enum name="tabMode" value="2"/>
</attr>
@ -2068,17 +2068,22 @@
<attr name="tintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and icon color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
</declare-styleable>
@ -2090,17 +2095,22 @@
<attr format="color" name="tickMarkTint"/>
<attr name="tickMarkTintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and drawable color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
</declare-styleable>
@ -2119,9 +2129,10 @@
<attr name="android:textAppearance"/>
<attr format="enum" name="autoSizeTextType">
<!-- No auto-sizing (default). -->
<enum name="none" value="0"/>
<!-- Uniform horizontal and vertical text size scaling to fit within the
container. -->
<enum name="uniform" value="1"/>
</attr>
@ -2502,17 +2513,22 @@
<attr name="buttonTintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and icon color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
</declare-styleable>
@ -2533,70 +2549,76 @@
<attr name="layout_anchorGravity">
<!-- Push object to the top of its container, not changing its size. -->
<flag name="top" value="0x30"/>
<!-- Push object to the bottom of its container, not changing its size. -->
<flag name="bottom" value="0x50"/>
<!-- Push object to the left of its container, not changing its size. -->
<flag name="left" value="0x03"/>
<!-- Push object to the right of its container, not changing its size. -->
<flag name="right" value="0x05"/>
<!-- Place object in the vertical center of its container, not changing its size. -->
<flag name="center_vertical" value="0x10"/>
<!-- Grow the vertical size of the object if needed so it completely fills its container. -->
<flag name="fill_vertical" value="0x70"/>
<!-- Place object in the horizontal center of its container, not changing its size. -->
<flag name="center_horizontal" value="0x01"/>
<!-- Grow the horizontal size of the object if needed so it completely fills its container. -->
<flag name="fill_horizontal" value="0x07"/>
<!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. -->
<flag name="center" value="0x11"/>
<!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. -->
<flag name="fill" value="0x77"/>
<!-- Additional option that can be set to have the top and/or bottom edges of
the child clipped to its container's bounds.
The clip will be based on the vertical gravity: a top gravity will clip the bottom
edge, a bottom gravity will clip the top edge, and neither will clip both edges. -->
<flag name="clip_vertical" value="0x80"/>
<!-- Additional option that can be set to have the left and/or right edges of
the child clipped to its container's bounds.
The clip will be based on the horizontal gravity: a left gravity will clip the right
edge, a right gravity will clip the left edge, and neither will clip both edges. -->
<flag name="clip_horizontal" value="0x08"/>
<!-- Push object to the beginning of its container, not changing its size. -->
<flag name="start" value="0x00800003"/>
<!-- Push object to the end of its container, not changing its size. -->
<flag name="end" value="0x00800005"/>
</attr>
<attr format="enum" name="layout_insetEdge">
<!-- Don't inset. -->
<enum name="none" value="0x0"/>
<!-- Inset the top edge. -->
<enum name="top" value="0x30"/>
<!-- Inset the bottom edge. -->
<enum name="bottom" value="0x50"/>
<!-- Inset the left edge. -->
<enum name="left" value="0x03"/>
<!-- Inset the right edge. -->
<enum name="right" value="0x05"/>
<!-- Inset the start edge. -->
<enum name="start" value="0x00800003"/>
<!-- Inset the end edge. -->
<enum name="end" value="0x00800005"/>
</attr>
<attr name="layout_dodgeInsetEdges">
<!-- Don't dodge any edges -->
<flag name="none" value="0x0"/>
<!-- Dodge the top inset edge. -->
<flag name="top" value="0x30"/>
<!-- Dodge the bottom inset edge. -->
<flag name="bottom" value="0x50"/>
<!-- Dodge the left inset edge. -->
<flag name="left" value="0x03"/>
<!-- Dodge the right inset edge. -->
<flag name="right" value="0x05"/>
<!-- Dodge the start inset edge. -->
<flag name="start" value="0x00800003"/>
<!-- Dodge the end inset edge. -->
<flag name="end" value="0x00800005"/>
<!-- Dodge all the inset edges. -->
<flag name="all" value="0x77"/>
</attr>
</declare-styleable>
@ -2629,14 +2651,23 @@
<attr format="reference" name="fontProviderCerts"/>
<attr name="fontProviderFetchStrategy">
<!-- The blocking font fetch works as follows.
First, check the local cache, then if the requested font is not cached, request the
font from the provider and wait until it is finished. You can change the length of
the timeout by modifying fontProviderFetchTimeout. If the timeout happens, the
default typeface will be used instead. -->
<enum name="blocking" value="0"/>
<!-- The async font fetch works as follows.
First, check the local cache, then if the requeted font is not cached, trigger a
request the font and continue with layout inflation. Once the font fetch succeeds, the
target text view will be refreshed with the downloaded font data. The
fontProviderFetchTimeout will be ignored if async loading is specified. -->
<enum name="async" value="1"/>
</attr>
<attr format="integer" name="fontProviderFetchTimeout">
<!-- A special value for the timeout. In this case, the blocking font fetching will not
timeout and wait until a reply is received from the font provider. -->
<enum name="forever" value="-1"/>
</attr>
</declare-styleable>
@ -2824,15 +2855,24 @@
<attr name="showAsAction">
<!-- Never show this item in an action bar, show it in the overflow menu instead.
Mutually exclusive with "ifRoom" and "always". -->
<flag name="never" value="0"/>
<!-- Show this item in an action bar if there is room for it as determined
by the system. Favor this option over "always" where possible.
Mutually exclusive with "never" and "always". -->
<flag name="ifRoom" value="1"/>
<!-- Always show this item in an actionbar, even if it would override
the system's limits of how much stuff to put there. This may make
your action bar look bad on some screens. In most cases you should
use "ifRoom" instead. Mutually exclusive with "ifRoom" and "never". -->
<flag name="always" value="2"/>
<!-- When this item is shown as an action in the action bar, show a text
label with it even if it has an icon representation. -->
<flag name="withText" value="4"/>
<!-- This item's action view collapses to a normal menu
item. When expanded, the action view takes over a
larger segment of its container. -->
<flag name="collapseActionView" value="8"/>
</attr>
@ -2856,17 +2896,22 @@
<attr name="iconTintMode">
<!-- The tint is drawn on top of the icon.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the icon. The icons
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the icon, but with the icons alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the icon with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and icon color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
@ -2981,17 +3026,22 @@
<attr format="color" name="thumbTint"/>
<attr name="thumbTintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and drawable color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
@ -3000,17 +3050,22 @@
<attr format="color" name="trackTint"/>
<attr name="trackTintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and drawable color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
@ -3071,9 +3126,9 @@
<attr name="contentInsetEndWithActions"/>
<attr format="dimension" name="maxButtonHeight"/>
<attr name="buttonGravity">
<!-- Push object to the top of its container, not changing its size. -->
<flag name="top" value="0x30"/>
<!-- Push object to the bottom of its container, not changing its size. -->
<flag name="bottom" value="0x50"/>
</attr>
@ -3115,17 +3170,22 @@
<attr name="backgroundTintMode">
<!-- The tint is drawn on top of the drawable.
[Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
<enum name="src_over" value="3"/>
<!-- The tint is masked by the alpha channel of the drawable. The drawables
color channels are thrown out. [Sa * Da, Sc * Da] -->
<enum name="src_in" value="5"/>
<!-- The tint is drawn above the drawable, but with the drawables alpha
channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] -->
<enum name="src_atop" value="9"/>
<!-- Multiplies the color and alpha channels of the drawable with those of
the tint. [Sa * Da, Sc * Dc] -->
<enum name="multiply" value="14"/>
<!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
<enum name="screen" value="15"/>
<!-- Combines the tint and icon color and alpha channels, clamping the
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16"/>
</attr>
</declare-styleable>

File diff suppressed because one or more lines are too long

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\res"/><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\res"/><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\res"/><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\res"/><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\res"/></dataSet><mergedItems/></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\assets"/><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\assets"/><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\assets"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\jniLibs"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\shaders"/></dataSet></merger>

@ -1,4 +1,4 @@
#Sat Jan 11 23:18:21 CST 2025
#Tue Jan 14 03:37:29 CST 2025
base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
base.2=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex

@ -1,6 +1,6 @@
#Tue Jan 07 21:10:29 CST 2025
base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
#Wed Dec 25 11:27:54 CST 2024
base.0=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
base.1=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
path.0=0/classes.dex
path.1=13/classes.dex
renamed.0=classes.dex

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save