OSDN Git Service
Tom Taylor [Wed, 5 Nov 2014 04:20:11 +0000 (04:20 +0000)]
am
db864e4d: am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Eric Gilmore [Wed, 5 Nov 2014 00:12:16 +0000 (00:12 +0000)]
am
bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
* commit '
bf78adb25e80b9107fcd682d30e7157093681547':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
Eric Gilmore [Tue, 28 Oct 2014 20:33:30 +0000 (13:33 -0700)]
Adding 5.0 emulator image and removing older image.
2nd patch set includes low/high res. images.
Bug:
18026943
Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
Scott Kennedy [Tue, 4 Nov 2014 18:06:32 +0000 (18:06 +0000)]
am
d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
* commit '
d78ce50372ec473b6a895d053f9ffc2956e933ef':
Fix a small typo in a variable name
Scott Kennedy [Tue, 4 Nov 2014 18:01:27 +0000 (18:01 +0000)]
Merge "Fix a small typo in a variable name" into lmp-docs
Ricardo Cervera [Tue, 4 Nov 2014 18:00:56 +0000 (18:00 +0000)]
am
61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
* commit '
61f91724a9375732cd95333921388a3e5a64ac33':
docs: Fix the circularReveal example.
Ricardo Cervera [Tue, 4 Nov 2014 17:56:21 +0000 (17:56 +0000)]
Merge "docs: Fix the circularReveal example." into lmp-docs
Tom Taylor [Tue, 4 Nov 2014 17:49:26 +0000 (17:49 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:42:20 +0000 (17:42 +0000)]
am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Mark Renouf [Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)]
If no display settings are matched, return the first one. DO NOT MERGE automerge:
cf0f740 -s ours
automerge:
01afc37 -s ours
* commit '
01afc37403a244e75fbfa385b197d76e476213e8':
Mark Renouf [Tue, 4 Nov 2014 07:14:17 +0000 (07:14 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge:
7be03da -s ours
automerge:
ff2e718 -s ours
* commit '
ff2e71830cafe063e876e5a56db0d33a8a5ba679':
kmccormick [Tue, 4 Nov 2014 07:13:11 +0000 (07:13 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge:
3e92c4a
automerge:
5298190
* commit '
5298190a30288d29cb9107d89b00411def3e469b':
David Friedman [Tue, 4 Nov 2014 00:59:31 +0000 (00:59 +0000)]
am
a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug:
17192985" into lmp-docs
* commit '
a827de4e8bcd8d90987387b1acf8d8856104e21c':
Fixed ADB documentation to work properly on Windows Bug:
17192985
David Friedman [Tue, 4 Nov 2014 00:05:51 +0000 (00:05 +0000)]
Merge "Fixed ADB documentation to work properly on Windows Bug:
17192985" into lmp-docs
Deepanshu Gupta [Mon, 3 Nov 2014 23:15:01 +0000 (23:15 +0000)]
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:14:44 +0000 (23:14 +0000)]
Merge "Support framework menus in ActionBar" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:13:13 +0000 (23:13 +0000)]
Merge "Use the right layout for inflating Action Bar." into lmp-dev
Scott Kennedy [Mon, 3 Nov 2014 21:56:18 +0000 (13:56 -0800)]
Fix a small typo in a variable name
Change-Id: If431236bf6885b3b0ef2c967869320538222ee33
Baligh Uddin [Mon, 3 Nov 2014 21:56:10 +0000 (13:56 -0800)]
Import translations. DO NOT MERGE
Bug:
18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import
Dirk Dougherty [Mon, 3 Nov 2014 21:13:25 +0000 (21:13 +0000)]
am
e1970f12: Doc change: Tv doc updates for publishing in Google Play.
* commit '
e1970f12583120613bc94e15841f6a7cc7919f68':
Doc change: Tv doc updates for publishing in Google Play.
Luan Nguyen [Mon, 3 Nov 2014 21:10:02 +0000 (21:10 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge:
aec7c97
automerge:
4182391
* commit '
418239190b0d0e6921ee0e1e498a34bb7cddc392':
Joe Fernandez [Mon, 3 Nov 2014 21:08:45 +0000 (21:08 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge:
90f734e
automerge:
3d76f6a
* commit '
3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':
Natalie Masse [Mon, 3 Nov 2014 21:07:41 +0000 (21:07 +0000)]
Scott Rowe [Mon, 3 Nov 2014 21:05:48 +0000 (21:05 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge:
a1e3063
automerge:
e0da6dd
* commit '
e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':
Joe Fernandez [Mon, 3 Nov 2014 21:04:37 +0000 (21:04 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge:
2f9ea27
automerge:
d6ed575
* commit '
d6ed5752da2c741b43d7c4d4d33da955c4fc72b9':
Prashant Malani [Mon, 3 Nov 2014 21:03:23 +0000 (21:03 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge:
645e017 -s ours
automerge:
a8f4b8a -s ours
* commit '
a8f4b8a26055055cc5efa3a33862db6f5ca572a5':
Ricardo Cervera [Mon, 3 Nov 2014 21:02:22 +0000 (21:02 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs automerge:
dc1f308
automerge:
884b473
* commit '
884b473ad8bccfef4e379de9034278ffa2113780':
Luan Nguyen [Mon, 3 Nov 2014 20:59:12 +0000 (20:59 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge:
c07a288
automerge:
cc8b367
* commit '
cc8b36706cd976d8313ba35c238920079005578e':
smain@google.com [Mon, 3 Nov 2014 20:58:03 +0000 (20:58 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page automerge:
e43bb6a
automerge:
870afdb
* commit '
870afdb39abdb308aee8d035f5e72251059f7af4':
smain@google.com [Mon, 3 Nov 2014 20:56:59 +0000 (20:56 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906 automerge:
6fbe299
automerge:
469c8c8
* commit '
469c8c898389368b7fb9f34c302d810565e29326':
Ricardo Cervera-Navarro [Mon, 3 Nov 2014 20:55:52 +0000 (20:55 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge:
c93723b
automerge:
4687757
* commit '
46877572906d932d27bc39f0a347d17607411282':
Rich Slogar [Mon, 3 Nov 2014 20:54:50 +0000 (20:54 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge:
858cfad
automerge:
d84910b
* commit '
d84910b06b8d8af7de04f975e58a77e65f888374':
Eric Gilmore [Mon, 3 Nov 2014 20:53:40 +0000 (20:53 +0000)]
Merge commit \'
a4eb81b\' into klp-modular-dev-plus-aosp
automerge:
068cb36
* commit '
068cb36877144dc337766c1113250f5ebc2cbf6f':
Joe Fernandez [Mon, 3 Nov 2014 20:50:40 +0000 (20:50 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
automerge:
a9d803e
* commit '
a9d803e0f7efe4c899ea37a50653452edb6d77fd':
Dirk Dougherty [Sun, 2 Nov 2014 04:40:32 +0000 (21:40 -0700)]
Doc change: Tv doc updates for publishing in Google Play.
cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
Fred Fettinger [Mon, 3 Nov 2014 20:47:38 +0000 (20:47 +0000)]
am
b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
automerge:
7565da1 -s ours
* commit '
7565da1f38f9bd1aad1749aa829b54fe2df223b6':
smain@google.com [Mon, 3 Nov 2014 20:46:33 +0000 (20:46 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
automerge:
3f0cf02
* commit '
3f0cf028aef394d91610344850cfc3c2e76b4ebb':
Quddus Chong [Mon, 3 Nov 2014 20:42:23 +0000 (20:42 +0000)]
am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
automerge:
581d03b
* commit '
581d03b1d539ebd3180dee5680d712f74011a3e4':
Deepanshu Gupta [Mon, 3 Nov 2014 20:40:55 +0000 (20:40 +0000)]
am
4f133894: Exclude KXmlParser from LayoutLib.
automerge:
adb14af
* commit '
adb14afbfb4c37cfc684537d85123b36539fffed':
Joe Fernandez [Mon, 3 Nov 2014 20:37:46 +0000 (20:37 +0000)]
am
59c04ece: am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge:
37ec657
* commit '
37ec65701121374b0edf3cfc454463c90666399d':
Deepanshu Gupta [Mon, 3 Nov 2014 20:34:42 +0000 (20:34 +0000)]
am
11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge:
fcaf3e9 -s ours
* commit '
fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
Rich Slogar [Mon, 3 Nov 2014 20:33:08 +0000 (20:33 +0000)]
am
916a6ea3: am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge:
9779c90
* commit '
9779c905eac26ab6ce7ce775587c75f1de081dd4':
Quddus Chong [Mon, 3 Nov 2014 20:31:51 +0000 (20:31 +0000)]
am
bb5a1848: am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge:
dfb86b9
* commit '
dfb86b994ff7d51ba1a1683c7123195cc9930c95':
Quddus Chong [Mon, 3 Nov 2014 20:30:45 +0000 (20:30 +0000)]
am
bf29d697: am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge:
9566bd2
* commit '
9566bd23390b0f21582a59673ded22f47b50ffe0':
Ricardo Cervera [Mon, 3 Nov 2014 20:29:24 +0000 (20:29 +0000)]
am
a18075e8: am
bd964cad: docs: Removing references to self note on Common Intents page.
automerge:
5f9d680
* commit '
5f9d680dd73b437e1e311f11f255b659ad18135b':
Ricardo Cervera [Mon, 3 Nov 2014 20:28:06 +0000 (20:28 +0000)]
am
6d30f576: am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
automerge:
a6abe30
* commit '
a6abe30397cf1f67b871a3db7555aa7f0f9841d9':
Quddus Chong [Mon, 3 Nov 2014 20:23:39 +0000 (20:23 +0000)]
am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
automerge:
ddb8c4e
* commit '
ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':
Ricardo Cervera [Mon, 3 Nov 2014 20:22:28 +0000 (20:22 +0000)]
am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
automerge:
2166913
* commit '
2166913933661f4f85fd649ad55997d59a5e3d31':
Rich Slogar [Mon, 3 Nov 2014 20:21:20 +0000 (20:21 +0000)]
am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
automerge:
f07d984
* commit '
f07d984fed70be0718e7e9019bc933f58fbeca46':
smain@google.com [Mon, 3 Nov 2014 20:20:13 +0000 (20:20 +0000)]
am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
automerge:
90ab19b
* commit '
90ab19bb8dec2e444e274ab4c8990545b481ca7b':
Joe Fernandez [Mon, 3 Nov 2014 19:41:56 +0000 (19:41 +0000)]
am
eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit '
eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014
Joe Fernandez [Mon, 3 Nov 2014 19:37:19 +0000 (19:37 +0000)]
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
Joe Fernandez [Thu, 30 Oct 2014 17:57:31 +0000 (10:57 -0700)]
docs: Update Android Dashboard for November 2014
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
Ricardo Cervera [Mon, 3 Nov 2014 17:31:32 +0000 (17:31 +0000)]
am
3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
* commit '
3e621914cacf692700dce007ec7d7893fcc12a8c':
docs: Add links to Wear UI training from Design pages.
Ricardo Cervera [Mon, 3 Nov 2014 17:27:08 +0000 (17:27 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
Scott Rowe [Mon, 3 Nov 2014 16:54:29 +0000 (16:54 +0000)]
am
cd796536: Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
* commit '
cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
docs: b/
18119632 isGame, b/
18119595 banner
Scott Rowe [Mon, 3 Nov 2014 16:24:36 +0000 (16:24 +0000)]
Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
Scott Rowe [Sat, 1 Nov 2014 16:28:23 +0000 (16:28 +0000)]
am
aa275bf9: Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
* commit '
aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
docs: b/
15180738 - invalid urls in badge generator
Scott Rowe [Sat, 1 Nov 2014 16:23:10 +0000 (16:23 +0000)]
Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
Joe Fernandez [Sat, 1 Nov 2014 01:14:15 +0000 (01:14 +0000)]
am
e8ad737d: docs: multidex - building apps with over 65K method references
* commit '
e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
docs: multidex - building apps with over 65K method references
Joe Fernandez [Fri, 31 Oct 2014 06:59:28 +0000 (23:59 -0700)]
docs: multidex - building apps with over 65K method references
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
Scott Rowe [Fri, 31 Oct 2014 20:59:45 +0000 (13:59 -0700)]
docs: b/
15180738 - invalid urls in badge generator
Change-Id: Ifb7ab1ad1b860c7fb7faec624b7d3ad4244fee36
Joe Fernandez [Fri, 31 Oct 2014 19:28:30 +0000 (19:28 +0000)]
am
ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs
* commit '
ea17fdecae470beeae8e12666254bf8f6446b06e':
docs:studio-updates-814v2
Joe Fernandez [Fri, 31 Oct 2014 19:23:45 +0000 (19:23 +0000)]
Merge "docs:studio-updates-814v2" into lmp-docs
Rich Slogar [Fri, 31 Oct 2014 18:03:26 +0000 (11:03 -0700)]
docs:studio-updates-814v2
Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
smain@google.com [Fri, 31 Oct 2014 17:58:09 +0000 (17:58 +0000)]
am
26bf2f7b: revise helpouts tags to use just one on each page
* commit '
26bf2f7b8730d9b4b1459d229207fe55597b000d':
revise helpouts tags to use just one on each page
smain@google.com [Fri, 31 Oct 2014 17:45:23 +0000 (10:45 -0700)]
revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
smain@google.com [Fri, 31 Oct 2014 17:45:23 +0000 (10:45 -0700)]
revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
Scott Rowe [Wed, 29 Oct 2014 20:32:30 +0000 (13:32 -0700)]
docs: b/
18119632 isGame, b/
18119595 banner
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
Alex Klyubin [Fri, 31 Oct 2014 15:44:35 +0000 (15:44 +0000)]
am
dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
* commit '
dd8accfe0f3d71a4e6402595fea48bf435a09b65':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Alex Klyubin [Fri, 31 Oct 2014 15:36:44 +0000 (15:36 +0000)]
Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
Ricardo Cervera [Fri, 31 Oct 2014 15:16:04 +0000 (15:16 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev
Mark Renouf [Fri, 31 Oct 2014 09:21:12 +0000 (09:21 +0000)]
If no display settings are matched, return the first one. DO NOT MERGE
automerge:
cf0f740 -s ours
* commit '
cf0f740e39f79da3fc8367c61ed473273248e8c1':
If no display settings are matched, return the first one. DO NOT MERGE
Joe Fernandez [Fri, 31 Oct 2014 05:21:22 +0000 (05:21 +0000)]
am
81fcc85c: Merge "docs:studio-update-814" into lmp-docs
* commit '
81fcc85c23eea3905238f3f8d359df0344c37865':
docs:studio-update-814
Joe Fernandez [Fri, 31 Oct 2014 05:18:42 +0000 (05:18 +0000)]
Merge "docs:studio-update-814" into lmp-docs
Mark Renouf [Fri, 31 Oct 2014 03:13:21 +0000 (03:13 +0000)]
am
cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE
* commit '
cf0f740e39f79da3fc8367c61ed473273248e8c1':
If no display settings are matched, return the first one. DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 20:57:30 +0000 (16:57 -0400)]
If no display settings are matched, return the first one. DO NOT MERGE
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.
BUG:
18130296
BUG:
18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
Rich Slogar [Wed, 29 Oct 2014 21:54:24 +0000 (14:54 -0700)]
docs:studio-update-814
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
Mark Renouf [Thu, 30 Oct 2014 23:07:22 +0000 (23:07 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
automerge:
7be03da -s ours
* commit '
7be03da0d4365346934c9d6672526119765d1047':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Scott Rowe [Thu, 30 Oct 2014 23:06:18 +0000 (23:06 +0000)]
am
397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit '
397eb67fbf9af409406750ce58a16b64b4a6b1e2':
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
Scott Rowe [Thu, 30 Oct 2014 22:55:19 +0000 (22:55 +0000)]
Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
Mark Renouf [Thu, 30 Oct 2014 22:33:32 +0000 (22:33 +0000)]
am
7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
* commit '
7be03da0d4365346934c9d6672526119765d1047':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 22:27:03 +0000 (22:27 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
Alex Klyubin [Thu, 30 Oct 2014 20:33:58 +0000 (13:33 -0700)]
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Bug:
18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
Mark Renouf [Thu, 30 Oct 2014 20:40:27 +0000 (16:40 -0400)]
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
BUG:
18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
David Friedman [Thu, 30 Oct 2014 19:56:37 +0000 (19:56 +0000)]
am
e91c37de: Fixes wrongly nested braces. Bug:
17499985
* commit '
e91c37de784babbe879c78c83817b99d54b61d2f':
Fixes wrongly nested braces. Bug:
17499985
Deepanshu Gupta [Thu, 30 Oct 2014 19:18:56 +0000 (12:18 -0700)]
Fix BridgeContext.get*ResourceValue()
getFrameworkResourceValue() and getProjectResourceValue() never really
returned the defValue passed to them, instead creating a new id for
non-existent resources. We now checks for the existence of the resources
before trying to obtain the id.
Change-Id: Ie3103ba32af6186651a5f77c27d1efc33dc2bcc7
Deepanshu Gupta [Thu, 30 Oct 2014 18:44:14 +0000 (11:44 -0700)]
Support framework menus in ActionBar
Add support for adding menus in the framework namespace to the ActionBar
preview. If a menu id name begins with the android namespace prefix
(android:) we find the framework menu and render it.
Change-Id: If52910b46154591883af2b2f357e72eea6f84235
Deepanshu Gupta [Mon, 27 Oct 2014 17:34:23 +0000 (10:34 -0700)]
Use the right layout for inflating Action Bar.
The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.
Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
David Friedman [Thu, 30 Oct 2014 18:55:53 +0000 (11:55 -0700)]
Fixes wrongly nested braces.
Bug:
17499985
Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
David Friedman [Thu, 30 Oct 2014 18:19:20 +0000 (11:19 -0700)]
Fixed ADB documentation to work properly on Windows
Bug:
17192985
Change-Id: Iea9eb4e1eb53718ddfb0ca3e1c5f09504f987457
Ricardo Cervera [Thu, 30 Oct 2014 15:34:37 +0000 (15:34 +0000)]
am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
docs: Two-page notification fix.
Ricardo Cervera [Thu, 30 Oct 2014 15:27:31 +0000 (15:27 +0000)]
Merge "docs: Two-page notification fix." into lmp-docs
kmccormick [Thu, 30 Oct 2014 05:23:58 +0000 (05:23 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
automerge:
3e92c4a
* commit '
3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:20:34 +0000 (23:20 +0000)]
am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:12:52 +0000 (23:12 +0000)]
am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:09:23 +0000 (23:09 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
kmccormick [Wed, 29 Oct 2014 23:04:28 +0000 (23:04 +0000)]
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
Doc update: deliv receipt, rate exceeded, bug fixes.
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
OSDN Git Service
