some changes

[from now] 2014/12/23 23:34:30

 app/build.gradle                                   |  2 +-
 app/src/main/AndroidManifest.xml                   |  4 ++
 .../example/oky/u_do/Activity/SettingActivity.java | 65 +++++++++++++++++++
 .../oky/u_do/Fragment/AppDialogFragment.java       | 73 ++++++++++++++++++++++
 .../oky/u_do/Fragment/LIcenseDialogFragment.java   | 40 ++++++++++++
 .../java/com/example/oky/u_do/MainActivity.java    |  5 ++
 app/src/main/res/layout/activity_setting.xml       | 11 ++++
 .../main/res/layout/fragment_license_dialog.xml    | 41 ++++++++++++
 app/src/main/res/menu/menu_main.xml                |  2 -
 app/src/main/res/menu/menu_setting.xml             |  7 +++
 app/src/main/res/values/strings.xml                | 15 +++++
 app/src/main/res/values/themes.xml                 |  9 +++
 app/src/main/res/xml/preference.xml                | 27 ++++++++
 13 files changed, 298 insertions(+), 3 deletions(-)

some changes

[from now] 2014/12/24 00:31:50

 app/build.gradle                                   |  2 +-
 .../example/oky/u_do/Activity/SettingActivity.java |  9 +++--
 .../oky/u_do/Fragment/AppDialogFragment.java       |  2 +-
 .../oky/u_do/Fragment/LIcenseDialogFragment.java   | 39 ++++++++++++++++++++--
 app/src/main/res/layout/cell.xml                   |  1 +
 .../main/res/layout/fragment_license_dialog.xml    |  7 ++--
 app/src/main/res/values/themes.xml                 |  4 +--
 7 files changed, 50 insertions(+), 14 deletions(-)

[from now] 2014/12/24 22:44:03

 .../oky/u_do/Fragment/LIcenseDialogFragment.java   | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)
add preferenceActivity

[from now] 2014/12/27 00:12:52

 app/build.gradle                                   |   4 -
 app/src/main/assets/license.txt                    | 113 ++++++++++++++
 .../example/oky/u_do/Activity/EditActivity.java    |  57 +++++--
 .../example/oky/u_do/Activity/SettingActivity.java |  20 +++
 .../oky/u_do/Adapter/MemoListItemAdapter.java      |   2 +-
 .../oky/u_do/Fragment/LicenseDialogFragment.java   |  67 +++++++--
 .../example/oky/u_do/Fragment/MemoFragment.java    | 163 +++++++++++++++++++--
 .../example/oky/u_do/Fragment/TodoFragment.java    |  22 +--
 .../java/com/example/oky/u_do/MainActivity.java    |  34 ++++-
 app/src/main/res/layout/activity_edit.xml          |  57 ++-----
 app/src/main/res/layout/activity_setting.xml       |   3 +-
 app/src/main/res/values/strings.xml                |   4 +-
 app/src/main/res/xml/preference.xml                |   4 +-
 13 files changed, 440 insertions(+), 110 deletions(-)

[from now] 2014/12/27 00:28:16

 app/src/main/res/layout/activity_edit.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[from now] 2014/12/27 16:23:56

 .../java/com/example/oky/u_do/Adapter/ViewPagerAdapter.java   |  1 -
 .../main/java/com/example/oky/u_do/Fragment/PageFragment.java | 11 +++++++++++
 .../main/java/com/example/oky/u_do/Fragment/TodoFragment.java |  2 +-
 app/src/main/java/com/example/oky/u_do/MainActivity.java      |  1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

[from now] 2014/12/27 18:03:36

 .../example/oky/u_do/Adapter/ViewPagerAdapter.java |  1 +
 .../example/oky/u_do/Fragment/PageFragment.java    | 11 ----
 .../example/oky/u_do/Fragment/TodoFragment.java    |  3 ++
 .../example/oky/u_do/Helper/HoldableViewPager.java | 38 +++++++++++++
 .../java/com/example/oky/u_do/MainActivity.java    | 62 ++++++++++++----------
 .../example/oky/u_do/Util/ActionModeManager.java   | 34 ++++++++++++
 app/src/main/res/layout/activity_main.xml          |  5 +-
 app/src/main/res/layout/transparent_view.xml       |  8 +++
 8 files changed, 122 insertions(+), 40 deletions(-)

[from now] 2014/12/27 19:24:22

 app/build.gradle                                   |   1 -
 .../oky/u_do/Helper/PagerSlidingTabStrip.java      | 786 +++++++++++++++++++++
 .../java/com/example/oky/u_do/MainActivity.java    |  42 +-
 app/src/main/res/drawable/background_tab.xml       |   8 +
 app/src/main/res/layout/activity_main.xml          |   2 +-
 app/src/main/res/layout/tab.xml                    |   8 +
 app/src/main/res/layout/transparent_view.xml       |   8 -
 app/src/main/res/values/attrs.xml                  |  32 +
 app/src/main/res/values/colors.xml                 |   4 +
 9 files changed, 840 insertions(+), 51 deletions(-)

[from now] 2014/12/27 19:42:15

 app/src/main/res/values/colors.xml | 5 +++--
 app/src/main/res/values/themes.xml | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)
Merge branch 'preferenceActivity'