Skip to content

Ics #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
championswimmer wants to merge 6 commits into
base: ics
Choose a base branch
from
Open

Ics #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7fc2ce
make achepclock to override deskclock
championswimmer Jun 22, 2012
7b98063
fix deskclocktests conflict
championswimmer Jun 22, 2012
d405bd6
Fix Default and Hungarian language missing strings
Daveee10 Jun 24, 2012
7827a25
Merge championswimmer's changes
Daveee10 Jun 24, 2012
c3309c7
Fix: Math - Double "9" button
Daveee10 Jun 28, 2012
0beea7b
Merge remote-tracking branch 'achep/ics' into ics
championswimmer Jul 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_PACKAGE_NAME := DeskClock
LOCAL_PACKAGE_NAME := AchepClock

LOCAL_OVERRIDES_PACKAGES := AlarmClock
LOCAL_OVERRIDES_PACKAGES := AlarmClock DeskClock

LOCAL_SDK_VERSION := current

Expand Down
4 changes: 2 additions & 2 deletions tests/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_PACKAGE_NAME := DeskClockTests
LOCAL_PACKAGE_NAME := AchepClockTests

LOCAL_INSTRUMENTATION_FOR := DeskClock
LOCAL_INSTRUMENTATION_FOR := AchepClock

include $(BUILD_PACKAGE)