Merge lp://staging/narau into lp://staging/narau/fdroid
Proposed by
Yvon TANGUY
| Status: | Merged |
|---|---|
| Merged at revision: | 48 |
| Proposed branch: | lp://staging/narau |
| Merge into: | lp://staging/narau/fdroid |
| Diff against target: |
4521 lines (+932/-662) 112 files modified
Assets/gen_png.py (+63/-8) Assets/holo_dark/ic_erase.svg (+50/-0) Assets/holo_dark/ic_media_next.svg (+21/-4) Assets/holo_dark/ic_media_play.svg (+23/-4) Assets/holo_dark/ic_media_previous.svg (+24/-5) Narau/AndroidManifest.xml (+2/-2) Narau/project.properties (+1/-1) Narau/res/layout-land/download.xml (+1/-1) Narau/res/layout-land/learn_writing.xml (+1/-1) Narau/res/layout-large-land/dictionary_offline.xml (+2/-0) Narau/res/layout-large-land/download.xml (+1/-1) Narau/res/layout-large-land/kanji_to_words.xml (+1/-1) Narau/res/layout-large-land/learn_writing.xml (+1/-1) Narau/res/layout-large-port/download.xml (+1/-1) Narau/res/layout-large-port/kanji_to_words.xml (+1/-1) Narau/res/layout-large-port/learn_writing.xml (+1/-1) Narau/res/layout/download.xml (+1/-1) Narau/res/layout/kanji_line_sub_category.xml (+0/-1) Narau/res/layout/kanji_to_words.xml (+1/-1) Narau/res/layout/learn_writing.xml (+1/-1) Narau/res/layout/main_menu_item.xml (+13/-4) Narau/res/layout/narau.xml (+7/-11) Narau/res/values-large/dimens.xml (+7/-0) Narau/res/values/dimens.xml (+5/-0) Narau/res/values/values.xml (+1/-1) Narau/src/org/vono/narau/Narau.java (+1/-1) Narau/src/org/vono/narau/QuitThread.java (+2/-2) Narau/src/org/vono/narau/common/Common.java (+8/-11) Narau/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java (+2/-1) Narau/src/org/vono/narau/common/dictionary/EntryListFragment.java (+1/-1) Narau/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java (+18/-14) Narau/src/org/vono/narau/common/kanji/KanjiView.java (+7/-7) Narau/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java (+1/-1) Narau/src/org/vono/narau/db/DictionaryDB.java (+5/-5) Narau/src/org/vono/narau/db/InfosDB.java (+5/-0) Narau/src/org/vono/narau/db/KanjiDB.java (+15/-15) Narau/src/org/vono/narau/dictionary/DictionaryBase.java (+2/-1) Narau/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java (+4/-4) Narau/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java (+5/-3) Narau/src/org/vono/narau/dictionary/HistoryFragment.java (+1/-1) Narau/src/org/vono/narau/download/DownloaderActivity.java (+3/-3) Narau/src/org/vono/narau/download/DownloaderGzipDB.java (+2/-2) Narau/src/org/vono/narau/exercise/DrillCharActivity.java (+20/-14) Narau/src/org/vono/narau/learn/reading/KanaChartActivity.java (+9/-11) Narau/src/org/vono/narau/learn/reading/KanjiToWordActivity.java (+2/-2) Narau/src/org/vono/narau/learn/writing/LearnWritingActivity.java (+7/-7) Narau/src/org/vono/narau/models/dictionary/Entry.java (+12/-9) Narau/src/org/vono/narau/models/history/OnlineResult.java (+2/-1) Narau/src/org/vono/narau/models/history/SearchResult.java (+5/-0) Narau/src/org/vono/narau/preferences/Preferences.java (+2/-0) Narau/src/org/vono/narau/utils/FontFitTextView.java (+11/-11) Narau/src/org/vono/narau/utils/JsonReader.java (+6/-6) Narau/src/org/vono/narau/utils/Language.java (+1/-1) Narau/src/org/vono/narau/utils/StringPool.java (+3/-3) NarauCupcake/.settings/org.eclipse.jdt.core.prefs (+7/-0) NarauCupcake/AndroidManifest.xml (+2/-2) NarauCupcake/res/layout-land/download.xml (+1/-1) NarauCupcake/res/layout-land/learn_writing.xml (+1/-1) NarauCupcake/res/layout/download.xml (+1/-1) NarauCupcake/res/layout/kanji_to_words.xml (+1/-1) NarauCupcake/res/layout/learn_writing.xml (+1/-1) NarauCupcake/res/values/values.xml (+1/-0) NarauCupcake/src/android/compat/view/MenuCompat.java (+1/-0) NarauCupcake/src/android/compat/view/MenuInflater.java (+1/-0) NarauCupcake/src/android/compat/view/menu/IconMenuItemView.java (+1/-0) NarauCupcake/src/android/compat/view/menu/IconMenuView.java (+1/-0) NarauCupcake/src/android/compat/view/menu/MenuBuilder.java (+2/-1) NarauCupcake/src/android/compat/view/menu/MenuItemImpl.java (+1/-1) NarauCupcake/src/android/compat/view/menu/SubMenuBuilder.java (+1/-0) NarauCupcake/src/android/support/v4/app/BackStackRecord.java (+2/-0) NarauCupcake/src/android/support/v4/app/DialogFragment.java (+1/-0) NarauCupcake/src/android/support/v4/app/Fragment.java (+260/-322) NarauCupcake/src/android/support/v4/app/FragmentActivity.java (+1/-0) NarauCupcake/src/android/support/v4/app/FragmentManager.java (+3/-0) NarauCupcake/src/android/support/v4/app/ListFragment.java (+1/-0) NarauCupcake/src/android/support/v4/app/LoaderManager.java (+1/-0) NarauCupcake/src/android/support/v4/app/NotificationCompat.java (+5/-0) NarauCupcake/src/android/support/v4/app/TaskStackBuilder.java (+1/-0) NarauCupcake/src/android/support/v4/content/Loader.java (+1/-0) NarauCupcake/src/android/support/v4/util/LogWriter.java (+1/-0) NarauCupcake/src/android/support/v4/util/SparseArrayCompat.java (+1/-0) NarauCupcake/src/org/vono/narau/Narau.java (+2/-3) NarauCupcake/src/org/vono/narau/QuitThread.java (+2/-2) NarauCupcake/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java (+2/-1) NarauCupcake/src/org/vono/narau/common/dictionary/EntryListFragment.java (+1/-1) NarauCupcake/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java (+15/-11) NarauCupcake/src/org/vono/narau/common/kanji/KanjiView.java (+7/-7) NarauCupcake/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java (+1/-1) NarauCupcake/src/org/vono/narau/db/DictionaryDB.java (+5/-5) NarauCupcake/src/org/vono/narau/db/InfosDB.java (+5/-0) NarauCupcake/src/org/vono/narau/db/KanjiDB.java (+15/-15) NarauCupcake/src/org/vono/narau/dictionary/DictionaryBase.java (+2/-0) NarauCupcake/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java (+6/-6) NarauCupcake/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java (+25/-8) NarauCupcake/src/org/vono/narau/dictionary/HistoryFragment.java (+1/-1) NarauCupcake/src/org/vono/narau/download/DownloaderActivity.java (+3/-3) NarauCupcake/src/org/vono/narau/download/DownloaderGzipDB.java (+2/-2) NarauCupcake/src/org/vono/narau/exercise/DrillCharActivity.java (+20/-14) NarauCupcake/src/org/vono/narau/learn/reading/KanaChartActivity.java (+9/-11) NarauCupcake/src/org/vono/narau/learn/reading/KanjiToWordActivity.java (+22/-7) NarauCupcake/src/org/vono/narau/learn/writing/LearnWritingActivity.java (+35/-10) NarauCupcake/src/org/vono/narau/models/dictionary/Entry.java (+12/-9) NarauCupcake/src/org/vono/narau/models/history/OnlineResult.java (+1/-0) NarauCupcake/src/org/vono/narau/models/history/SearchResult.java (+5/-0) NarauCupcake/src/org/vono/narau/models/kanji/KanjiData.java (+1/-1) NarauCupcake/src/org/vono/narau/preferences/Preferences.java (+2/-0) NarauCupcake/src/org/vono/narau/preferences/PreferencesActivity.java (+2/-3) NarauCupcake/src/org/vono/narau/utils/FontFitTextView.java (+11/-11) NarauCupcake/src/org/vono/narau/utils/JsonReader.java (+7/-6) NarauCupcake/src/org/vono/narau/utils/Language.java (+1/-1) NarauCupcake/src/org/vono/narau/utils/StringPool.java (+3/-3) NarauDBInfo/narau_db_infos.txt (+14/-0) |
| To merge this branch: | bzr merge lp://staging/narau |
| Related bugs: | |
| Related blueprints: |
Kanji to words
(Medium)
Kanji radicals filter
(Medium)
Rework the dictionary activity
(Medium)
Split databases
(Medium)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yvon TANGUY | Approve | ||
|
Review via email:
|
|||
Description of the change
Version 0.8.1 to fix the build problem with SDK 17 (4.2 Jelly Bean) not supported yet.
To post a comment you must log in.
Revision history for this message
| Yvon TANGUY (vono22) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
