diff options
| author | Maurice Lam <yukl@google.com> | 2014-06-05 19:15:20 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2014-06-16 17:19:14 -0700 |
| commit | 6776c67ac12161b3e5e25c8848b46656ea91be1d (patch) | |
| tree | ea4c47c340a22993f3767f5b2f3776c9a6bda9c1 /Android.mk | |
| parent | 5884f7ff5ef13c2e92ac8ea6460019379d429035 (diff) | |
| download | packages_apps_Settings-6776c67ac12161b3e5e25c8848b46656ea91be1d.zip packages_apps_Settings-6776c67ac12161b3e5e25c8848b46656ea91be1d.tar.gz packages_apps_Settings-6776c67ac12161b3e5e25c8848b46656ea91be1d.tar.bz2 | |
[WifiSetup] Use setup navigation bar
Use the setup navigation bar in wifi setup activity.
1. Include frameworks/opt/setupwizard/navigationbar/common.mk in the
make file.
2. Make WifiSetupActivity implement NavigationBarListener
3. Added the fragment in setup_preference.xml, wrapping the whole
screen in a LinearLayout
4. Moved skip and next screen logic to WifiSetupActivity, refactored
the skip dialogs into a fragment
Change-Id: Ia973c0a61faa3ead201bd10d5aa8de4bc6e091c1
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -10,6 +10,8 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ src/com/android/settings/EventLogTags.logtags +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + LOCAL_PACKAGE_NAME := Settings LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true @@ -18,9 +20,11 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_AAPT_FLAGS += -c zz_ZZ +include frameworks/opt/setupwizard/navigationbar/common.mk + include $(BUILD_PACKAGE) -# Use the folloing include to make our test apk. +# Use the following include to make our test apk. ifeq (,$(ONE_SHOT_MAKEFILE)) include $(call all-makefiles-under,$(LOCAL_PATH)) endif |