From af0628ca822cf2473fb3c119732474fa1fe89214 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 13:06:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/color.json | 176 +++++++---------------------------------------------------
1 files changed, 22 insertions(+), 154 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/color.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/color.json
index 464ce01..c9e157f 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/color.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/color.json
@@ -1,178 +1,46 @@
[
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_light.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\switch_thumb_material_light.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_primary_text_disable_only_material_light.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_dark.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_disable_only_material_dark.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_dark.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\switch_thumb_material_dark.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\design_tint_password_toggle.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\color\\design_tint_password_toggle.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_dark.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_primary_text_material_dark.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_search_url_text.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_search_url_text.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\tab_visitor_register.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\color\\tab_visitor_register.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_seek_thumb.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_seek_thumb.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_primary_text_material_light.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_edittext.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_edittext.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_secondary_text_material_light.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\design_error.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\color\\design_error.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\tab_item_tv.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\color\\tab_item_tv.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_dark.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_material_dark.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_dark.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_primary_text_disable_only_material_dark.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_light.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_secondary_text_material_light.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_dark.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_secondary_text_material_dark.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_light.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_material_light.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_search_url_text.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\abc_search_url_text.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_dark.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_material_dark.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_btn_checkable.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_btn_checkable.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_spinner.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_spinner.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_switch_track.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_switch_track.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_light.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_secondary_text_material_light.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_material_light.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_material_light.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_default.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_default.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_switch_track.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_switch_track.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_btn_colored_borderless_text_material.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_btn_colored_borderless_text_material.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_search_url_text.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_search_url_text.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_seek_thumb.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_seek_thumb.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_dark.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\switch_thumb_material_dark.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_light.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_disable_only_material_light.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_hint_foreground_material_dark.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_hint_foreground_material_dark.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_dark.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_secondary_text_material_dark.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_btn_colored_text_material.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_btn_colored_text_material.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_light.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\switch_thumb_material_light.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\design_tint_password_toggle.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\color\\design_tint_password_toggle.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\design_error.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\color\\design_error.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_secondary_text_material_dark.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_secondary_text_material_dark.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_btn_checkable.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_btn_checkable.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_dark.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_disable_only_material_dark.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_dark.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\switch_thumb_material_dark.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_btn_colored_text_material.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_btn_colored_text_material.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_primary_text_disable_only_material_light.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_primary_text_disable_only_material_light.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_hint_foreground_material_dark.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_hint_foreground_material_dark.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_btn_colored_borderless_text_material.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_btn_colored_borderless_text_material.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_switch_thumb.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_switch_thumb.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_spinner.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_spinner.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_default.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_default.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_switch_thumb.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_switch_thumb.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_edittext.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_tint_edittext.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_hint_foreground_material_light.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_hint_foreground_material_light.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\abc_hint_foreground_material_light.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\color\\abc_hint_foreground_material_light.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\color\\switch_thumb_material_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\color\\switch_thumb_material_light.xml"
}
]
\ No newline at end of file
--
Gitblit v1.8.0