Merge "distinguish signed and unsigned user builds in UI"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 461aff4..d4024cf 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -181,6 +181,9 @@
# Clean up around the /system/app -> /system/priv-app migration
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
+# Clean up old location of generated Java files from aidl
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/Makefile b/core/Makefile
index d610867..83e7e7c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -191,9 +191,14 @@
TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
bash $(BUILDINFO_SH) > $@
- $(hide) if [ -f "$(system_prop_file)" ]; then \
- cat $(system_prop_file) >> $@; \
- fi
+ $(hide) $(foreach file,$(system_prop_file), \
+ if [ -f "$(file)" ]; then \
+ echo "#" >> $@; \
+ echo Target buildinfo from: "$(file)"; \
+ echo "# from $(file)" >> $@; \
+ echo "#" >> $@; \
+ cat $(file) >> $@; \
+ fi;)
$(if $(ADDITIONAL_BUILD_PROPERTIES), \
$(hide) echo >> $@; \
echo "#" >> $@; \
@@ -871,6 +876,11 @@
#######
## platform.zip: system, plus other files to be used in PDK fusion build,
## in a zip file
+##
+## PDK_PLATFORM_ZIP_PRODUCT_BINARIES is used to store specified files to platform.zip.
+## The variable will be typically set from BoardConfig.mk.
+## Files under out dir will be rejected to prevent possible conflicts with other rules.
+PDK_PLATFORM_ZIP_PRODUCT_BINARIES := $(filter-out $(OUT_DIR)/%,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES))
INSTALLED_PLATFORM_ZIP := $(PRODUCT_OUT)/platform.zip
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES)
$(call pretty,"Platform zip package: $(INSTALLED_PLATFORM_ZIP)")
@@ -882,7 +892,9 @@
ifeq (true,$(PLATFORM_ZIP_ADD_JAVA))
$(hide) cd $(OUT_DIR) && zip -qry $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)
endif
-
+ifneq ($(PDK_PLATFORM_ZIP_PRODUCT_BINARIES),)
+ $(hide) zip -qry $@ $(PDK_PLATFORM_ZIP_PRODUCT_BINARIES)
+endif
.PHONY: platform
platform: $(INSTALLED_PLATFORM_ZIP)
diff --git a/core/cleanspec.mk b/core/cleanspec.mk
index d4a8eed..500ce54 100644
--- a/core/cleanspec.mk
+++ b/core/cleanspec.mk
@@ -64,6 +64,6 @@
# ************************************************
subdir_cleanspecs := \
- $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git . CleanSpec.mk)
+ $(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git . CleanSpec.mk)
include $(subdir_cleanspecs)
subdir_cleanspecs :=
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 11f7f84..3aed193 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -129,6 +129,7 @@
LOCAL_CLANG:=
LOCAL_ADDRESS_SANITIZER:=
LOCAL_JAR_EXCLUDE_FILES:=
+LOCAL_JAR_PACKAGES:=
LOCAL_LINT_FLAGS:=
LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
# Don't delete the META_INF dir when merging static Java libraries.
diff --git a/core/definitions.mk b/core/definitions.mk
index 7834baa..990e880 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -147,7 +147,7 @@
# $(1): directory to search under
# Ignores $(1)/Android.mk
define first-makefiles-under
-$(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git \
+$(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git \
--mindepth=2 $(1) Android.mk)
endef
@@ -1511,6 +1511,10 @@
-name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \
$(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \
| xargs rm -rf)
+$(if $(PRIVATE_JAR_PACKAGES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -mindepth 1 -type d \
+ $(foreach pkg, $(PRIVATE_JAR_PACKAGES), \
+ -not -path $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))) \
+ | xargs rm -rf)
$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
$@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
endef
@@ -1558,6 +1562,10 @@
-name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \
$(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \
| xargs rm -rf)
+$(if $(PRIVATE_JAR_PACKAGES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -mindepth 1 -type d \
+ $(foreach pkg, $(PRIVATE_JAR_PACKAGES), \
+ -not -path $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))) \
+ | xargs rm -rf)
$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
$@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
$(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 8b2c868..ce27763 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -4,7 +4,7 @@
####################################
# TODO: replace it with device's BOOTCLASSPATH
-DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium
+DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium
DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
DEXPREOPT_BUILD_DIR := $(OUT_DIR)
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 8a5c556..0d3094d 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -69,7 +69,7 @@
LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)
endif
else
- LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES)
+ LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES)
endif # LOCAL_SDK_VERSION
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
diff --git a/core/java.mk b/core/java.mk
index 5315ccc..c7e93b7 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,7 +43,7 @@
endif
else
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
- LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES)
+ LOCAL_JAVA_LIBRARIES := core core-junit ext framework framework2 $(LOCAL_JAVA_LIBRARIES)
endif
endif
@@ -337,6 +337,7 @@
# via deps on the target that generates the sources.
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
+$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)
$(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \
$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \
diff --git a/core/main.mk b/core/main.mk
index 25ec74e..47847bf 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -479,7 +479,7 @@
# Can't use first-makefiles-under here because
# --mindepth=2 makes the prunes not work.
subdir_makefiles := \
- $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git $(subdirs) Android.mk)
+ $(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git $(subdirs) Android.mk)
include $(subdir_makefiles)
diff --git a/core/pathmap.mk b/core/pathmap.mk
index f3a9e78..5dfc543 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -75,11 +75,6 @@
# A list of all source roots under frameworks/base, which will be
# built into the android.jar.
#
-# Note - "common" is included here, even though it is also built
-# into a static library (android-common) for unbundled use. This
-# is so common and the other framework libraries can have mutual
-# interdependencies.
-#
FRAMEWORKS_BASE_SUBDIRS := \
$(addsuffix /java, \
core \
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 41a82d4..da55b38 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -47,6 +47,7 @@
target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \
target/common/obj/JAVA_LIBRARIES/ext_intermediates \
target/common/obj/JAVA_LIBRARIES/framework_intermediates \
+ target/common/obj/JAVA_LIBRARIES/framework2_intermediates \
target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \
target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \
diff --git a/core/phony_package.mk b/core/phony_package.mk
index 70b6aac..b534335 100644
--- a/core/phony_package.mk
+++ b/core/phony_package.mk
@@ -7,7 +7,7 @@
include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE):
+$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(hide) echo "Fake: $@"
$(hide) mkdir -p $(dir $@)
$(hide) touch $@
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 6e08832..fd8e0f5 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -84,6 +84,14 @@
ifdef LOCAL_INSTALLED_MODULE
ifdef LOCAL_SHARED_LIBRARIES
$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))
+
+# We also need the LOCAL_BUILT_MODULE dependency,
+# since we use -rpath-link which points to the built module's path.
+built_shared_libraries := \
+ $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
+ $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \
+ $(LOCAL_SHARED_LIBRARIES)))
+$(LOCAL_BUILT_MODULE) : $(built_shared_libraries)
endif
endif
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 35cbd27..3bd4f31 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -44,3 +44,11 @@
# Build and enable the OpenGL ES View renderer. When running on the emulator,
# the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk
index c3881b4..e6f43af 100644
--- a/target/board/generic_mips/BoardConfig.mk
+++ b/target/board/generic_mips/BoardConfig.mk
@@ -48,3 +48,11 @@
# Build and enable the OpenGL ES View renderer. When running on the emulator,
# the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 4a9e5fe..ed7da38 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -33,3 +33,11 @@
# Build and enable the OpenGL ES View renderer. When running on the emulator,
# the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/target/product/base.mk b/target/product/base.mk
index d3c18fb..846f69e 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -32,6 +32,7 @@
framework \
fsck_msdos \
ime \
+ inputflinger \
javax.obex \
libSR_AudioIn \
libandroid \
@@ -45,6 +46,8 @@
libchromium_net \
libdl \
libeffects \
+ libinput \
+ libinputflinger \
libiprouteutil \
libjni_latinime \
libjnigraphics \
@@ -70,7 +73,6 @@
libstagefright_foundation \
libstagefright_omx \
libstagefright_yuv \
- libsystem_server \
libusbhost \
libutils \
libvisualizer \
@@ -85,6 +87,7 @@
netcfg \
netd \
ping \
+ ping6 \
platform.xml \
pppd \
pm \
@@ -96,7 +99,6 @@
services \
settings \
svc \
- system_server \
tc \
vdc \
vold \
diff --git a/target/product/core.mk b/target/product/core.mk
index 56ee946..b321efd 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -29,6 +29,8 @@
Contacts \
ContactsProvider \
DefaultContainerService \
+ DocumentsUI \
+ ExternalStorageProvider \
Home \
KeyChain \
PicoTts \
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index f71d0a0..d66cb6a 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -90,7 +90,7 @@
outline:none;
width:auto;
margin: 20px 0 0; }
-
+
#devdoc-nav h2 {
border:0;
}
@@ -99,7 +99,7 @@
position: fixed;
margin:0;
top: 20px; }
-
+
#devdoc-nav span.small {
font-size:12px;
font-weight:normal;
@@ -116,7 +116,7 @@
a:focus,
a:active {
color: #33b5e5 !important; }
-
+
a.external-link {
background:url('../images/styles/open_new_page.png') no-repeat 100% 50%;
padding-right:16px;
@@ -338,10 +338,10 @@
width: 34px;
height: 34px; }
#nav li.expanded li ul.tree-list-children {
- padding:0;
+ padding:0;
}
#nav li.expanded li ul.tree-list-children .tree-list-children {
- padding:0 0 0 10px;
+ padding:0 0 0 10px;
}
#nav li span.tree-list-subtitle {
display:inline-block;
@@ -408,7 +408,7 @@
.content-header.just-links {
margin-bottom:0;
padding-bottom:0;}
-
+
.content-header h1 {
color:#000;
margin:0;
@@ -470,8 +470,8 @@
height: 10px;
display: inline-block;
margin-left: 5px; }
-
-
+
+
.training-nav-top a {
display:block;
float:left;
@@ -488,25 +488,25 @@
border-left:0;
width:123px;
}
-
+
.paging-links a.disabled,
.training-nav-top a.disabled,
.content-footer a.disabled {
color:#bbb;
}
-
+
.paging-links a.disabled:hover,
.training-nav-top a.disabled:hover,
.content-footer a.disabled:hover {
cursor:default;
color:#bbb !important;
}
-
+
.training-nav-top a.start-class-link,
.training-nav-top a.start-course-link {
width:262px;
}
-
+
/* list of classes on course landing page */
ol.class-list {
list-style:none;
@@ -549,7 +549,7 @@
ol.class-list li a.title:hover span {
display:block;
}
-
+
#jd-content
ol.class-list li img {
float:left;
@@ -577,29 +577,29 @@
margin:0 0 6px;
line-height:16px;
}
-
-
+
+
.hide {
display:none !important;
}
-
+
.content-footer.next-class {
display:block;
border:0;
margin-top:0;
padding-top:0;
}
-
+
.content-footer.next-class a.next-class-link {
display:block;
float:right;
text-transform:uppercase;
}
-
-
-
+
+
+
/* inner-doc tabs w/ title */
-
+
div#title-tabs-wrapper {
border-bottom:1px solid #ccc;
margin:20px 0 30px;
@@ -844,6 +844,18 @@
width: 216px;
height: 384px; }
+.framed-nexus4-port-216 {
+ background: transparent url(../images/styles/device_nexus4_blank_port_432.png) no-repeat
+scroll top left;
+ background-size:240px 465px;
+ padding: 52px 12px 52px 12px;
+ overflow: hidden; }
+ .framed-nexus4-port-216, .framed-nexus4-port-216 video,
+ .framed-nexus4-port-216 img {
+ width: 216px;
+ height: 360px; }
+
+
/* landing page disclosures */
.landing-page-link {
text-decoration: none;
@@ -920,7 +932,7 @@
.ui-table th,
.ui-table td {
padding: 5px 10px;
- background-color: inherit;
+ background-color: inherit;
border:0;}
.ui-table thead th {
font-weight: bold; }
@@ -945,7 +957,7 @@
background-image: url(../images/styles/ico_wrong.png); }
.do-dont-label.good {
background-image: url(../images/styles/ico_good.png); }
-
+
@@ -996,7 +1008,7 @@
fieldset, iframe, img {
border: 0;
}
-img {
+img {
-ms-interpolation-mode: bicubic;
vertical-align: middle;
max-width: 100%;
@@ -1031,7 +1043,7 @@
margin-right:320px;
}
h1.super {
- font-size: 37px;
+ font-size: 37px;
}
h2 {
color:#333;
@@ -1052,13 +1064,13 @@
font-size: 16px;
}
h5 {
- font-size: 14px;
+ font-size: 14px;
}
h5, h6 {
margin: 5px 0;
}
h6 {
- font-size: 12px;
+ font-size: 12px;
}
hr { /* applied to the bottom of h2 elements */
height: 1px;
@@ -1244,7 +1256,7 @@
padding: 0 24px 0 0;
}
.locales form {
- margin: 0;
+ margin: 0;
}
.locales select, .sites select {
line-height: 3.08;
@@ -1340,7 +1352,7 @@
padding: 2.5em 0;
border-top: solid 1px #ddd;
border-bottom: solid 1px #ddd;
- background: #f7f7f7;
+ background: #f7f7f7;
}
.wrap {
margin: 0 auto;
@@ -1466,7 +1478,7 @@
top: 24px;
left: 0
}
-.search .left, .search .right {
+.search .left, .search .right {
height: 5px;
width: 1px
}
@@ -1537,7 +1549,7 @@
padding: 0
}
.search-dropdown ul li {
- clear: both
+ clear: both
}
.search-dropdown img {
float: left;
@@ -1670,7 +1682,7 @@
endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
- box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
+ box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
color: #258AAF !important;
}
.button.big {
@@ -1703,7 +1715,7 @@
width:130px;
text-transform:uppercase;
font-weight:bold;
-
+
background-color: #f3f3f3;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), to(#ececec));
background-image: -webkit-linear-gradient(top, #f9f9f9, #ececec);
@@ -1961,9 +1973,9 @@
padding: 5px;
width: 130px;
}
-
+
.article form .browse .browse-msg {
- font-size: 11.5px;
+ font-size: 11.5px;
}
.article form .browse .button-secondary {
height: auto;
@@ -1978,7 +1990,7 @@
color: #222;
line-height: normal;
padding: 6px 10px;
- width: 300px;
+ width: 300px;
}
.article form textarea {
height: 150px;
@@ -2085,7 +2097,7 @@
padding: 1em;
overflow: auto;
border: solid 1px #ddd;
- background: #f7f7f7;
+ background: #f7f7f7;
}
.str { color: #080; }
.kwd { color: #008; }
@@ -2115,16 +2127,16 @@
height:270px;
max-height: inherit;
overflow: hidden;
- position: relative;
+ position: relative;
}
#classes-nav {
overflow: hidden;
- position: relative;
+ position: relative;
}
#packages-nav ul, #classes-nav ul {
list-style-type: none;
margin: 10px 0 20px 0;
- padding: 0;
+ padding: 0;
}
#classes-nav li {
font-weight: bold;
@@ -2142,7 +2154,7 @@
#classes-nav li li a, #classes-nav li li a:active, #classes-nav li li a:visited,
#nav-tree li a, #nav-tree li a:active, #nav-tree li a:visited {
color: #222;
- font-weight: normal;
+ font-weight: normal;
}
#packages-nav li a, #packages-nav li a:active, #packages-nav li a:visited,
#classes-nav li li a, #classes-nav li li a:active, #classes-nav li li a:visited {
@@ -2188,7 +2200,7 @@
#nav-swap .fullscreen.disabled {
background-position: 0 0;
}
-#nav-swap .fullscreen:hover,
+#nav-swap .fullscreen:hover,
#nav-swap .fullscreen:focus {
cursor:pointer;
}
@@ -2265,13 +2277,13 @@
margin-right:0;
}
#doc-content-container {
- margin-left: 291px
+ margin-left: 291px
}
#doc-header, #doc-content {
padding: 1em 2em;
}
#doc-header {
- background: #f7f7f7;
+ background: #f7f7f7;
}
#doc-header h1 {
line-height: 0;
@@ -2399,7 +2411,7 @@
border-bottom: solid 1px #ededed;
background: #f7f7f7 url("../images/resizable-s2.png") no-repeat scroll center center; }
/*
-.ui-resizable-e {
+.ui-resizable-e {
cursor: e-resize; width: 10px; right: 0; top: 0; height: 100%; border-right: solid
1px #ededed;background: #f7f7f7 url("../images/resizable-e2.png") no-repeat scroll center center; }
*/
@@ -2407,7 +2419,7 @@
/* --------------------------------------------------------------------------
Lightbox
*/
-.lightbox {
+.lightbox {
width: 769px;
padding: 1.5em;
margin: 0 auto;
@@ -2420,7 +2432,7 @@
.lightbox .header {
float: left;
width: 720px;
- margin: -10px 20px 10px 0;
+ margin: -10px 20px 10px 0;
}
.lightbox .close {
float: right;
@@ -2480,7 +2492,7 @@
.caption {
margin: 0.5em 0 2em 0;
color: #000;
- font-size: 11.5px;
+ font-size: 11.5px;
}
.nolist {
@@ -2539,19 +2551,19 @@
}
p.code-caption {
- margin: 0 0 4px 0;
+ margin-bottom: 4px;
font: 12px/1.5 monospace;
color:#666;
}
-div.note,
-div.caution,
+div.note,
+div.caution,
div.warning {
margin: 0 0 15px;
}
-p.note, div.note,
-p.caution, div.caution,
+p.note, div.note,
+p.caution, div.caution,
p.warning, div.warning {
padding: 0 0 0 10px;
border-left: 4px solid;
@@ -2649,6 +2661,7 @@
a.notice-developers,
a.notice-designers {
float:right;
+ clear:right;
width:238px;
min-height:50px;
margin:0 0 20px 20px;
@@ -2706,12 +2719,12 @@
/* -----------------------------------------------
-good/bad example containers
+good/bad example containers
*/
div.example-block {
background-repeat: no-repeat;
- background-position:10px 8px;
+ background-position:10px 8px;
background-color:#ccc;
padding:4px;
margin:.8em auto 1.5em 2em;
@@ -2745,7 +2758,7 @@
}
/* -----------------------------------------------
-Dialog box for popup messages
+Dialog box for popup messages
*/
div.dialog {
@@ -2811,9 +2824,9 @@
/* --------------------------------------------------------------------------
-Slideshow Controls & Next/Prev
+Slideshow Controls & Next/Prev
*/
-.slideshow-next, .slideshow-prev {
+.slideshow-next, .slideshow-prev {
width: 20px;
height: 36px;
text-indent: -1000em;
@@ -2836,7 +2849,7 @@
a.slideshow-prev, a.slideshow-prev:visited {
- float: left;
+ float: left;
background: url(../images/arrow-left.png) no-repeat 0 0
@@ -2844,18 +2857,18 @@
.slideshow-next:hover, .slideshow-prev:hover, .slideshow-next:focus, .slideshow-prev:focus {
- background-position: 0 -36px
+ background-position: 0 -36px
}
.slideshow-next:active, .slideshow-prev:active {
- background-position: 0 -72px
+ background-position: 0 -72px
}
.slideshow-nav {
width: 74px;
- margin: 0 auto;
+ margin: 0 auto;
}
.slideshow-nav a, .slideshow-nav a:visited {
display: inline-block;
@@ -2875,7 +2888,7 @@
.slideshow-nav a:active {
background: #1e799a;
- background: #ebebeb;
+ background: #ebebeb;
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
@@ -2888,7 +2901,7 @@
*/
ul.tabs {
padding: 0;
- margin: 2em 0 0 0;
+ margin: 2em 0 0 0;
}
ul.tabs:before, ul.tabs:after {
content: "";
@@ -2897,7 +2910,7 @@
}
ul.tabs li {
list-style-type: none;
- float: left;
+ float: left;
}
ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited {
display: block;
@@ -2911,7 +2924,7 @@
-moz-border-radius-bottomright: px;
-moz-border-radius-bottomleft: px;
-webkit-border-radius: 2px 2px px px;
- border-radius: 2px 2px px px;
+ border-radius: 2px 2px px px;
border-top: solid 1px #ebebeb;
border-left: solid 1px #ebebeb;
border-right: solid 1px #ebebeb;
@@ -2926,7 +2939,7 @@
EndColorStr='#fafafa');
}
ul.tabs li a:hover {
- color: #33B5E5;
+ color: #33B5E5;
}
ul.tabs li a.selected {
height: 37px;
@@ -2965,9 +2978,9 @@
.dialog .box-border .top,
.dialog .box-border .bottom { width:391px; }
-.box-border .left, .box-border .right {
+.box-border .left, .box-border .right {
width: 1px;
- height: 8px;
+ height: 8px;
}
.box-border .top { top: 0; left: 0 }
.box-border .top .left { top: 1px; left: 0 }
@@ -3002,10 +3015,10 @@
transition: color .4s ease;
}
.feature-box:hover {
- cursor: pointer;
+ cursor: pointer;
}
.feature-box:hover .box-border .top, .feature-box:hover .box-border .bottom, .feature-box:hover
-.left, .feature-box:hover .right {
+.left, .feature-box:hover .right {
background-color: #33B5E5;
}
.feature-box:hover h4, .feature-box:hover a {
@@ -3014,7 +3027,7 @@
/* --------------------------------------------------------------------------
Page-Specific Styles
*/
-.colors {
+.colors {
position: relative;
float: left;
width: 92px;
@@ -3433,7 +3446,7 @@
font-size:0.85em;
}
-.suggest-card.reference
+.suggest-card.reference
.search_filtered li.header {
color:#aaa;
font-size: 0.81em;
@@ -3784,7 +3797,7 @@
}
#quicknav {
- float:none;
+ float:none;
clear:both;
margin-left:180px;
margin-top:-30px;
@@ -3852,7 +3865,7 @@
#header-wrap.quicknav {
height:196px;
-
+
}
/* SEARCH AND MORE */
@@ -3899,7 +3912,7 @@
left: 0
}
-.search .left, .search .right {
+.search .left, .search .right {
height: 5px;
width: 1px
}
@@ -3925,10 +3938,10 @@
.search form input {
color: #2f2f2f;
font-size: 0.95em;
- width: 178px;
+ width: 178px;
border: none;
- margin-left: 6px;
- z-index: 1500;
+ margin-left: 6px;
+ z-index: 1500;
position: relative;
background-color: transparent;
border-bottom:1px solid #CCC;
@@ -3997,10 +4010,10 @@
opacity:0;
-webkit-transform-origin:100% 0%;
- -moz-transform-origin:100% 0%;
+ -moz-transform-origin:100% 0%;
-o-transform-origin:100% 0%;
transform-origin:100% 0%;
-
+
-webkit-transition-property: -webkit-opacity;
-webkit-transition-duration: .25s;
-webkit-transition-timing-function:ease;
@@ -4012,7 +4025,7 @@
-o-transition-property: -o-opacity;
-o-transition-duration: .25s;
-o-transition-timing-function:ease;
-
+
transition-property: opacity;
transition-duration: .25s;
transition-timing-function:ease;
@@ -4110,9 +4123,9 @@
border-radius:6px;
background-color:#ccc;
cursor:pointer;
- -webkit-transition:color .5s ease-in;
- -moz-transition:color .5s ease-in;
- -o-transition:color .5s ease-in;
+ -webkit-transition:color .5s ease-in;
+ -moz-transition:color .5s ease-in;
+ -o-transition:color .5s ease-in;
transition:color .5s ease-in;
}
.slideshow-container .pagination ul li:hover {
@@ -4248,7 +4261,7 @@
background-image: -ms-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: -o-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: linear-gradient(left, #5dbcd9, #4cadcb);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
}
.jspHorizontalBar .jspTrack,
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png
new file mode 100644
index 0000000..9d41aa3
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png
Binary files differ
