diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-09-17 01:07:32 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-09-17 01:07:32 +0100 |
commit | 07424d36c4da0afe19af7b646867317b2a35ab80 (patch) | |
tree | 6984abec67a5d88815b84c00d314a5c20fe126ea | |
parent | f49fc79b435b689c8aeb70d3af5769e264c395ed (diff) | |
parent | 20fe48ac3ec082f205ddbfe22d4575b7ea7b0a90 (diff) | |
download | replicant_build-07424d36c4da0afe19af7b646867317b2a35ab80.zip replicant_build-07424d36c4da0afe19af7b646867317b2a35ab80.tar.gz replicant_build-07424d36c4da0afe19af7b646867317b2a35ab80.tar.bz2 |
Merge tag 'android-4.3_r3' into cm-10.2
Android 4.3 release 3.0
Change-Id: I17ea872d02f9e19192b57015f90bfcc109ce7e19
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/definitions.mk | 1 | ||||
-rw-r--r-- | core/main.mk | 16 | ||||
-rw-r--r-- | core/prebuilt.mk | 2 | ||||
-rw-r--r-- | target/product/core.mk | 1 | ||||
-rw-r--r-- | target/product/mini.mk | 1 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 188 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png | bin | 0 -> 301931 bytes |
8 files changed, 117 insertions, 94 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 4d61a84..337dbbc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS15Q +export BUILD_ID=JLS36C diff --git a/core/definitions.mk b/core/definitions.mk index d2eb631..19ac773 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1999,6 +1999,7 @@ endef ########################################################### ## Define device-specific radio files ########################################################### +INSTALLED_RADIOIMAGE_TARGET := # Copy a radio image file to the output location, and add it to # INSTALLED_RADIOIMAGE_TARGET. diff --git a/core/main.mk b/core/main.mk index bf77bbd..bf9185f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -552,10 +552,20 @@ $(foreach m,$(ALL_MODULES), \ $(eval r := $(ALL_MODULES.$(m).REQUIRED)) \ $(if $(r), \ $(eval r := $(call module-installed-files,$(r))) \ - $(eval $(call add-required-deps,$(ALL_MODULES.$(m).INSTALLED),$(r))) \ + $(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \ + $(eval h_m := $(filter $(HOST_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \ + $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \ + $(eval h_r := $(filter $(HOST_OUT_ROOT)/%, $(r))) \ + $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \ + $(if $(h_m), $(eval $(call add-required-deps, $(h_m),$(h_r)))) \ ) \ ) +t_m := +h_m := +t_r := +h_r := + # Resolve the dependencies on shared libraries. $(foreach m,$(TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES), \ $(eval p := $(subst :,$(space),$(m))) \ @@ -833,6 +843,10 @@ else # TARGET_BUILD_APPS $(INSTALLED_FACTORY_BUNDLE_TARGET) \ ) + # Put a copy of the radio/bootloader files in the dist dir. + $(foreach f,$(INSTALLED_RADIOIMAGE_TARGET), \ + $(call dist-for-goals, droidcore, $(f))) + ifneq ($(TARGET_BUILD_PDK),true) $(call dist-for-goals, droidcore, \ $(APPS_ZIP) \ diff --git a/core/prebuilt.mk b/core/prebuilt.mk index f5732d1..fd8e0f5 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -89,7 +89,7 @@ $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLE # since we use -rpath-link which points to the built module's path. built_shared_libraries := \ $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ - $(addsuffix $(so_suffix), \ + $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ $(LOCAL_SHARED_LIBRARIES))) $(LOCAL_BUILT_MODULE) : $(built_shared_libraries) endif diff --git a/target/product/core.mk b/target/product/core.mk index 437290f..8f4e21f 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \ TelephonyProvider \ UserDictionaryProvider \ VpnDialogs \ - abcc \ atrace \ libandroidfw \ libaudiopreprocessing \ diff --git a/target/product/mini.mk b/target/product/mini.mk index 751b481..67ef4fd 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -64,7 +64,6 @@ PRODUCT_PACKAGES += \ Shell \ TelephonyProvider \ UserDictionaryProvider \ - abcc \ apache-xml \ audio \ bouncycastle \ diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index f71d0a0..0c12340 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -90,7 +90,7 @@ body { outline:none; width:auto; margin: 20px 0 0; } - + #devdoc-nav h2 { border:0; } @@ -99,7 +99,7 @@ body { position: fixed; margin:0; top: 20px; } - + #devdoc-nav span.small { font-size:12px; font-weight:normal; @@ -116,7 +116,7 @@ acronym:hover { 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 @@ video.with-shadow { 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 @@ video.with-shadow { .content-header.just-links { margin-bottom:0; padding-bottom:0;} - + .content-header h1 { color:#000; margin:0; @@ -470,8 +470,8 @@ video.with-shadow { height: 10px; display: inline-block; margin-left: 5px; } - - + + .training-nav-top a { display:block; float:left; @@ -488,25 +488,25 @@ video.with-shadow { 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 @@ video.with-shadow { ol.class-list li a.title:hover span { display:block; } - + #jd-content ol.class-list li img { float:left; @@ -577,29 +577,29 @@ video.with-shadow { 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 @@ scroll top left; 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 @@ scroll top left; .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 @@ scroll top left; background-image: url(../images/styles/ico_wrong.png); } .do-dont-label.good { background-image: url(../images/styles/ico_good.png); } - + @@ -996,7 +1008,7 @@ q { fieldset, iframe, img { border: 0; } -img { +img { -ms-interpolation-mode: bicubic; vertical-align: middle; max-width: 100%; @@ -1031,7 +1043,7 @@ h1.short { margin-right:320px; } h1.super { - font-size: 37px; + font-size: 37px; } h2 { color:#333; @@ -1052,13 +1064,13 @@ h4 { 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 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00)); padding: 0 24px 0 0; } .locales form { - margin: 0; + margin: 0; } .locales select, .sites select { line-height: 3.08; @@ -1340,7 +1352,7 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00)); 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 @@ Header, Login, Nav-X, Search top: 24px; left: 0 } -.search .left, .search .right { +.search .left, .search .right { height: 5px; width: 1px } @@ -1537,7 +1549,7 @@ Header, Login, Nav-X, Search padding: 0 } .search-dropdown ul li { - clear: both + clear: both } .search-dropdown img { float: left; @@ -1670,7 +1682,7 @@ color-stop(5%,#f9f9f9), color-stop(50%,#fafafa), color-stop(90%,#f9f9f9), color- 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 @@ endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */ 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 @@ ul ul { 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 @@ ul ul { color: #222; line-height: normal; padding: 6px 10px; - width: 300px; + width: 300px; } .article form textarea { height: 150px; @@ -2085,7 +2097,7 @@ pre { padding: 1em; overflow: auto; border: solid 1px #ddd; - background: #f7f7f7; + background: #f7f7f7; } .str { color: #080; } .kwd { color: #008; } @@ -2115,16 +2127,16 @@ Three-Pane 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 @@ Three-Pane #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 @@ a:visited, #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 @@ a:visited, 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; @@ -2346,9 +2358,6 @@ div.toggle-content.closed .toggle-content-toggleme { #jd-content img.toggle-content-img { margin:0 5px 5px 0; } -div.toggle-content p { - margin:10px 0 0; -} div.toggle-content-toggleme { padding:0 0 0 15px; } @@ -2399,7 +2408,7 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; }*/ 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 +2416,7 @@ cursor: e-resize; width: 10px; right: 0; top: 0; height: 100%; border-right: sol /* -------------------------------------------------------------------------- Lightbox */ -.lightbox { +.lightbox { width: 769px; padding: 1.5em; margin: 0 auto; @@ -2420,7 +2429,7 @@ Lightbox .lightbox .header { float: left; width: 720px; - margin: -10px 20px 10px 0; + margin: -10px 20px 10px 0; } .lightbox .close { float: right; @@ -2480,7 +2489,7 @@ table.blank th, table.blank td { .caption { margin: 0.5em 0 2em 0; color: #000; - font-size: 11.5px; + font-size: 11.5px; } .nolist { @@ -2539,19 +2548,19 @@ p.table-caption { } 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 +2658,7 @@ div.design-announce p { a.notice-developers, a.notice-designers { float:right; + clear:right; width:238px; min-height:50px; margin:0 0 20px 20px; @@ -2706,12 +2716,12 @@ a.header-toggle { /* ----------------------------------------------- -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 +2755,7 @@ div.example-block { } /* ----------------------------------------------- -Dialog box for popup messages +Dialog box for popup messages */ div.dialog { @@ -2811,9 +2821,9 @@ div#naMessage strong { /* -------------------------------------------------------------------------- -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 +2846,7 @@ a.slideshow-next, a.slideshow-next:visited { a.slideshow-prev, a.slideshow-prev:visited { - float: left; + float: left; background: url(../images/arrow-left.png) no-repeat 0 0 @@ -2844,18 +2854,18 @@ a.slideshow-prev, a.slideshow-prev:visited { .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 +2885,7 @@ a.slideshow-prev, a.slideshow-prev:visited { .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 +2898,7 @@ Tabs */ ul.tabs { padding: 0; - margin: 2em 0 0 0; + margin: 2em 0 0 0; } ul.tabs:before, ul.tabs:after { content: ""; @@ -2897,7 +2907,7 @@ ul.tabs:before, ul.tabs:after { } 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 +2921,7 @@ ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited { -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 +2936,7 @@ ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited { EndColorStr='#fafafa'); } ul.tabs li a:hover { - color: #33B5E5; + color: #33B5E5; } ul.tabs li a.selected { height: 37px; @@ -2965,9 +2975,9 @@ Feature Boxes .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 +3012,10 @@ Feature Boxes 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 +3024,7 @@ Feature Boxes /* -------------------------------------------------------------------------- Page-Specific Styles */ -.colors { +.colors { position: relative; float: left; width: 92px; @@ -3433,7 +3443,7 @@ ul.search_filtered { font-size:0.85em; } -.suggest-card.reference +.suggest-card.reference .search_filtered li.header { color:#aaa; font-size: 0.81em; @@ -3784,7 +3794,7 @@ EndColorStr='#ececec'); } #quicknav { - float:none; + float:none; clear:both; margin-left:180px; margin-top:-30px; @@ -3852,7 +3862,7 @@ EndColorStr='#ececec'); #header-wrap.quicknav { height:196px; - + } /* SEARCH AND MORE */ @@ -3899,7 +3909,7 @@ EndColorStr='#ececec'); left: 0 } -.search .left, .search .right { +.search .left, .search .right { height: 5px; width: 1px } @@ -3925,10 +3935,10 @@ EndColorStr='#ececec'); .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 +4007,10 @@ EndColorStr='#ececec'); 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 +4022,7 @@ EndColorStr='#ececec'); -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 +4120,9 @@ EndColorStr='#ececec'); 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 +4258,7 @@ a.download-sdk { 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 Binary files differnew file mode 100644 index 0000000..9d41aa3 --- /dev/null +++ b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png |