Jesse Zhao
75bcea0267
verify system and vendor image together before patching.
...
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
smain@google.com
02be18043c
am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2
am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
Ying Wang
98ae798535
Fix using variable intermediates.COMMON before defining.
...
In commit e9dd9f2bf
we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-18 15:13:04 -08:00
Ying Wang
2902d4585f
Add support for prebuilt AARs.
...
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit e9dd9f2bfc
)
2014-12-17 22:27:26 +00:00
smain@google.com
19832ae16a
am d742274e
: am b05558cf
: am 3de83c1b
: make shadowbox video always centered to fit the window height
...
* commit 'd742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
2014-12-17 20:20:20 +00:00
smain@google.com
fdb9fa0e2b
am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '351c908b757fcfee03d5f15b4a29cb9a48f93f46':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:31:06 +00:00
smain@google.com
351c908b75
am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '94e0b530868c56547ee05e84534fa68a1f6346f7':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:25:14 +00:00
smain@google.com
94e0b53086
fix bug that allowed only one video in the shadowbox per page
...
bug: 18777918
Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
2014-12-16 19:07:08 -08:00
smain@google.com
39bac0222b
am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'bfe3fc64add62518b619a052193269d3281475b9':
remove the Helpouts recruitment banner
2014-12-16 18:20:31 +00:00
smain@google.com
bfe3fc64ad
am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'bf644aa564263120fdc61a2578aa2466fbc1d55a':
remove the Helpouts recruitment banner
2014-12-16 18:13:09 +00:00
smain@google.com
bf644aa564
remove the Helpouts recruitment banner
...
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
2014-12-16 10:05:03 -08:00
Joe Fernandez
5576ef5b71
am b96b2a4a
: am 91f2ba64
: am a4417712
: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit 'b96b2a4ae621e1bd8529ef50bc00ddc048207ca3':
docs: SHA update in sdkpage.cs
2014-12-16 03:42:03 +00:00
smain@google.com
96ac360b39
am 2881d6f3
: am 9f88a60d
: am 481f15c1
: set youtube player lang based on user pref and enable captions when not English
...
* commit '2881d6f31b9daf9a3d701671eae3297040d84799':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 03:41:58 +00:00
smain@google.com
8f207ca046
am 2c3ae43f
: am 29e06142
: am d24088c0
: add analytics event to track from which page a video was started
...
* commit '2c3ae43f9e8329d7f0c24192fe1fd400d1a870b2':
add analytics event to track from which page a video was started
2014-12-16 03:40:27 +00:00
smain@google.com
305f55cd29
am 3ff2fd14
: am d7dbaf5c
: am ed677d7a
: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit '3ff2fd14b1276e3b9c0473bd987c1bb34925ef86':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 03:39:31 +00:00
Michael Runge
ea1dc69968
Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
2014-12-15 21:35:19 +00:00
smain@google.com
d742274e14
am b05558cf
: am 3de83c1b
: make shadowbox video always centered to fit the window height
...
* commit 'b05558cf01a42214efd0d8c6484c62a7b0212947':
make shadowbox video always centered to fit the window height
2014-12-15 18:00:18 +00:00
smain@google.com
b05558cf01
am 3de83c1b
: make shadowbox video always centered to fit the window height
...
* commit '3de83c1bcdf1229b51db7dbf9331611c596a478c':
make shadowbox video always centered to fit the window height
2014-12-15 17:54:02 +00:00
smain@google.com
3de83c1bcd
make shadowbox video always centered to fit the window height
...
Change-Id: I03f8ffac555dbbbbd5538fedf13413aca031fd74
2014-12-15 09:27:48 -08:00
Joe Fernandez
b96b2a4ae6
am 91f2ba64
: am a4417712
: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit '91f2ba648f4187cea415ddc826ef155afe7e8122':
docs: SHA update in sdkpage.cs
2014-12-13 00:55:39 +00:00
Joe Fernandez
91f2ba648f
am a4417712
: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit 'a4417712657f15cd8b36132bd642b54443cee1f0':
docs: SHA update in sdkpage.cs
2014-12-13 00:48:20 +00:00
Joe Fernandez
a441771265
Merge "docs: SHA update in sdkpage.cs" into lmp-docs
2014-12-13 00:43:10 +00:00
smain@google.com
2881d6f31b
am 9f88a60d
: am 481f15c1
: set youtube player lang based on user pref and enable captions when not English
...
* commit '9f88a60d5cb57552f88c26d7531ee235415dd381':
set youtube player lang based on user pref and enable captions when not English
2014-12-13 00:30:28 +00:00
smain@google.com
9f88a60d5c
am 481f15c1
: set youtube player lang based on user pref and enable captions when not English
...
* commit '481f15c172f06048f2934dac88e04e140d61041f':
set youtube player lang based on user pref and enable captions when not English
2014-12-13 00:21:31 +00:00
Rich Slogar
8d3c694de1
docs: SHA update in sdkpage.cs
...
Change-Id: I2c94b1af228295a3650d17e2c00023e5b52ec1b9
2014-12-12 16:21:03 -08:00
smain@google.com
481f15c172
set youtube player lang based on user pref and enable captions when not English
...
Change-Id: I3208074713d3f7b571a22a7ef8f18a9131827e98
2014-12-12 11:57:27 -08:00
smain@google.com
2c3ae43f9e
am 29e06142
: am d24088c0
: add analytics event to track from which page a video was started
...
* commit '29e06142fdb2b6225d38f0ce141d28156bbdfea3':
add analytics event to track from which page a video was started
2014-12-12 19:53:32 +00:00
smain@google.com
29e06142fd
am d24088c0
: add analytics event to track from which page a video was started
...
* commit 'd24088c08de24b6cb5efeecec406e5e9180c0b8b':
add analytics event to track from which page a video was started
2014-12-12 19:46:26 +00:00
smain@google.com
d24088c08d
add analytics event to track from which page a video was started
...
Change-Id: I9ba1f992c09fb9e18c55bca5bf3892e50f37012a
2014-12-12 11:37:22 -08:00
smain@google.com
3ff2fd14b1
am d7dbaf5c
: am ed677d7a
: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit 'd7dbaf5c14cf1e6669df0d21f552a9b21cb63fb7':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-12 18:42:58 +00:00
smain@google.com
d7dbaf5c14
am ed677d7a
: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit 'ed677d7a0e3491824584391d7255d113696bad85':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-12 18:29:36 +00:00
smain@google.com
ed677d7a0e
update analytics event for searches to make query case-insensitive
...
and save the URL instead of doc title.
Change-Id: Iad8c5f4873173f6964fc4ebffee8aef878891a8e
2014-12-12 10:19:17 -08:00
Dianne Hackborn
423854bfb9
am 934b04d3
: (-s ours) am 27fad66a
: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
...
* commit '934b04d3767974934d3d2e90e6196955f5b83d0c':
DO NOT MERGE. Bump version to 5.0.2.
2014-12-12 00:19:51 +00:00
Dianne Hackborn
934b04d376
am 27fad66a
: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
...
* commit '27fad66a8c730e58b3f2aab56edc8c6078b4283e':
DO NOT MERGE. Bump version to 5.0.2.
2014-12-11 22:29:46 +00:00
Dianne Hackborn
27fad66a8c
Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
2014-12-11 22:25:32 +00:00
Dianne Hackborn
592c24d865
DO NOT MERGE. Bump version to 5.0.2.
...
Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
2014-12-11 14:21:48 -08:00
Ying Wang
60686586a5
Add product variable PRODUCT_AAPT_PREBUILT_DPI
...
We use search LOCAL_DPI_VARIANTS in the list of
"$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)"
and the first takes precedence.
That way if we don't have a best match, we fall back to the second best,
the way how it worked with PRODUCT_AAPT_CONFIG previously.
Bug: 18388705
Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
2014-12-10 12:40:09 -08:00
Ying Wang
111ba923be
Bump generic_arm64 system partition size to 900M.
...
This fixes the arm64 sdk build.
Change-Id: Ic7b7ada79027845974cbcfc68941cfc87ed050fd
2014-12-10 09:56:06 -08:00
Michael Runge
e07c75a86b
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
...
This should also indicate release-keys.
Bug: 18281807
Change-Id: I8d2568ca346625b91384f7e639d9c92e97587755
2014-12-09 13:54:52 -08:00
smain@google.com
79ad9c786a
am 8aebbf0d
: am 0ecb5a68
: add links to release notes
...
* commit '8aebbf0dbaf37b558307a9d794dfbb041ce55614':
add links to release notes
2014-12-09 21:33:27 +00:00
David Friedman
03e066b759
am 83e96ca8
: am 1a0159f2
: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
...
* commit '83e96ca8c24256a989881d59d24f66d439c2f5f4':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-09 21:33:17 +00:00
smain@google.com
8aebbf0dba
am 0ecb5a68
: add links to release notes
...
* commit '0ecb5a688e6a954e8296547e84e58959e30ccd4e':
add links to release notes
2014-12-09 03:04:58 +00:00
David Friedman
83e96ca8c2
am 1a0159f2
: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
...
* commit '1a0159f216076579d128d17dc8292904606a3420':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-09 00:31:41 +00:00
smain@google.com
0ecb5a688e
add links to release notes
...
Change-Id: I04be73254e6d9bd020e9dea5b7d46b92e17e8f31
2014-12-08 13:58:54 -08:00
David Friedman
1a0159f216
Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
2014-12-08 19:55:47 +00:00
smain@google.com
07c19f6888
am 87b1b5ed
: am 102db8b5
: update sdk template with new studio downloads
...
* commit '87b1b5edb11644ac656a1d8df37201460289de94':
update sdk template with new studio downloads
2014-12-08 07:17:54 +00:00
smain@google.com
87b1b5edb1
am 102db8b5
: update sdk template with new studio downloads
...
* commit '102db8b58bd51aeaa7409924d5dc341f2f72b892':
update sdk template with new studio downloads
2014-12-08 07:10:39 +00:00
smain@google.com
102db8b58b
update sdk template with new studio downloads
...
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
2014-12-07 22:39:24 -08:00
smain@google.com
3984cca2a6
am 79ac4384
: am d53f0660
: update to sdk page template for Android Studio downloads
...
* commit '79ac4384637c77076f93307e61c8e2612df4a8cc':
update to sdk page template for Android Studio downloads
2014-12-08 03:53:00 +00:00