14934599dd
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests
58 lines
1.3 KiB
Makefile
58 lines
1.3 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-logtags-files-under, src)
|
|
|
|
LOCAL_MODULE := settings-logtags
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
|
|
# Build the Settings APK
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_PACKAGE_NAME := Settings
|
|
LOCAL_CERTIFICATE := platform
|
|
LOCAL_PRIVILEGED_MODULE := true
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_USE_AAPT2 := true
|
|
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_STATIC_ANDROID_LIBRARIES := \
|
|
android-support-v4 \
|
|
android-support-v13 \
|
|
android-support-v7-appcompat \
|
|
android-support-v7-cardview \
|
|
android-support-v7-preference \
|
|
android-support-v7-recyclerview \
|
|
android-support-v14-preference
|
|
|
|
LOCAL_JAVA_LIBRARIES := \
|
|
bouncycastle \
|
|
core-oj \
|
|
telephony-common \
|
|
ims-common
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := \
|
|
jsr305 \
|
|
settings-logtags
|
|
|
|
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
|
|
|
ifneq ($(INCREMENTAL_BUILDS),)
|
|
LOCAL_PROGUARD_ENABLED := disabled
|
|
LOCAL_JACK_ENABLED := incremental
|
|
LOCAL_JACK_FLAGS := --multi-dex native
|
|
endif
|
|
|
|
include frameworks/opt/setupwizard/library/common-gingerbread.mk
|
|
include frameworks/base/packages/SettingsLib/common.mk
|
|
|
|
include $(BUILD_PACKAGE)
|
|
|
|
# Use the following include to make our test apk.
|
|
ifeq (,$(ONE_SHOT_MAKEFILE))
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|
|
endif
|