OSDN Git Service
Ricardo Cervera [Thu, 23 Oct 2014 19:49:17 +0000 (19:49 +0000)]
am
ce3d72e4: am
8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
* commit '
ce3d72e4ad78c16fd95f1fcba51cc241163cdb0d':
docs: Updating dependency vers nums for support libs.
Ricardo Cervera [Thu, 23 Oct 2014 19:49:10 +0000 (19:49 +0000)]
am
92ddea18: am
30d0b242: Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
* commit '
92ddea18948a2524bc2e638a1c03c8b443e74316':
docs: Support lib dependency fix. Bug:
18029377
Sreeram Ramachandran [Thu, 23 Oct 2014 19:10:23 +0000 (19:10 +0000)]
Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev
Adam Lesinski [Thu, 23 Oct 2014 17:54:46 +0000 (17:54 +0000)]
Merge "First commit of split-select tool" into lmp-mr1-dev
Adam Lesinski [Tue, 16 Sep 2014 21:43:29 +0000 (14:43 -0700)]
First commit of split-select tool
This tool emits a set of rules as JSON for when a Split APK
should match a target device.
Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
John Reck [Thu, 23 Oct 2014 16:45:26 +0000 (16:45 +0000)]
Merge "Fix damage bug" into lmp-mr1-dev
Ricardo Cervera [Thu, 23 Oct 2014 15:43:48 +0000 (15:43 +0000)]
am
8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
* commit '
8755d9a5361d716433505e883986e8bf5f28d041':
docs: Updating dependency vers nums for support libs.
Ricardo Cervera [Thu, 23 Oct 2014 15:43:44 +0000 (15:43 +0000)]
am
30d0b242: Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
* commit '
30d0b24280abe4b2c5e1e20819d87f60d34964de':
docs: Support lib dependency fix. Bug:
18029377
Sreeram Ramachandran [Wed, 22 Oct 2014 18:10:20 +0000 (11:10 -0700)]
Add an API to select a network for a DatagramSocket.
Mirrors the API that does this for Sockets.
Bug:
18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
Ricardo Cervera [Thu, 23 Oct 2014 15:10:07 +0000 (15:10 +0000)]
Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
Ricardo Cervera [Thu, 23 Oct 2014 15:09:40 +0000 (15:09 +0000)]
Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
Joe Fernandez [Thu, 23 Oct 2014 08:02:56 +0000 (08:02 +0000)]
am
3bd3a9c1: am
7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev
* commit '
3bd3a9c105301f1d7585479e4222807cdee521ab':
docs: Add Wear App Quality checklist
Trevor Johns [Thu, 23 Oct 2014 08:02:53 +0000 (08:02 +0000)]
am
5111993f: am
fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
* commit '
5111993f839a68519aa8ba39a2ed05d8dbe13f63':
Docs: Update /samples/new/index.html for Clockwork Beryl release
Joe Fernandez [Thu, 23 Oct 2014 08:02:49 +0000 (08:02 +0000)]
am
e30fdb59: am
16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
* commit '
e30fdb596a5670a90482d8535352a33081784a8b':
docs: Add article describing Location API for Android Wear.
Joe Fernandez [Thu, 23 Oct 2014 08:02:45 +0000 (08:02 +0000)]
am
ac0e00db: am
eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
* commit '
ac0e00dbdf272595fe6032e0d7d52d2097850300':
docs:Build tools revisions 21.01 and 21.02
Eric Rowe [Thu, 23 Oct 2014 08:02:41 +0000 (08:02 +0000)]
am
d2983ced: am
34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev
* commit '
d2983ced58254f52d199981149c42a59642e59b2':
Add delay in ping connectivity test retry
smain@google.com [Thu, 23 Oct 2014 08:02:37 +0000 (08:02 +0000)]
am
3e2502cb: am
32c820fa: update android workplace screenshot bug:
18038081
* commit '
3e2502cbee68a4aa583227ea5328069275e6e192':
update android workplace screenshot bug:
18038081
Ye Wen [Thu, 23 Oct 2014 08:02:34 +0000 (08:02 +0000)]
am
4e0ba198: am
9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
* commit '
4e0ba1988a66ed731b0100554dc17ff44a07d164':
Disable Content-Disposition header for 53005 and 310120
smain@google.com [Thu, 23 Oct 2014 08:02:30 +0000 (08:02 +0000)]
am
b7db4ed0: am
9f987e0a: fix a few of the tags for helpouts compatibility
* commit '
b7db4ed08d8d03e317288a4739249b903b9d19a6':
fix a few of the tags for helpouts compatibility
smain@google.com [Thu, 23 Oct 2014 08:02:26 +0000 (08:02 +0000)]
am
20e6a369: am
54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
* commit '
20e6a369da29877a5adb77b77a754eda9b7ac054':
some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
Nancy Chen [Thu, 23 Oct 2014 08:02:23 +0000 (08:02 +0000)]
am
df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev
* commit '
df0ace26279f16beacdf9206cb2a8ecc126aecb7':
Add an option to set the selected phone account as the default. (1/3)
smain@google.com [Thu, 23 Oct 2014 08:02:19 +0000 (08:02 +0000)]
am
c5c029e9: am
13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev
* commit '
c5c029e91d2b4300ec39dde1b4511cd9bc59cfb8':
add helpouts widget to first round of pages
Joe Fernandez [Thu, 23 Oct 2014 07:55:41 +0000 (07:55 +0000)]
am
7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev
* commit '
7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
docs: Add Wear App Quality checklist
Trevor Johns [Thu, 23 Oct 2014 07:55:38 +0000 (07:55 +0000)]
am
fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
* commit '
fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
Docs: Update /samples/new/index.html for Clockwork Beryl release
Joe Fernandez [Thu, 23 Oct 2014 07:55:34 +0000 (07:55 +0000)]
am
16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
* commit '
16350261e0c491880be42a26bf53965c32e8dd0a':
docs: Add article describing Location API for Android Wear.
Joe Fernandez [Thu, 23 Oct 2014 07:55:31 +0000 (07:55 +0000)]
am
eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
* commit '
eaee4693814a1c3fbde06474a85570bbf228fc19':
docs:Build tools revisions 21.01 and 21.02
Eric Rowe [Thu, 23 Oct 2014 07:55:27 +0000 (07:55 +0000)]
am
34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev
* commit '
34766d9c3f88e864d37b5c2ece6218e83cd0fe7c':
Add delay in ping connectivity test retry
smain@google.com [Thu, 23 Oct 2014 07:55:23 +0000 (07:55 +0000)]
am
32c820fa: update android workplace screenshot bug:
18038081
* commit '
32c820fac0575b406acef688ce365d9c390fd93e':
update android workplace screenshot bug:
18038081
Ye Wen [Thu, 23 Oct 2014 07:55:19 +0000 (07:55 +0000)]
am
9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
* commit '
9d28487e05b6f5b2c4d464467f932060de463067':
Disable Content-Disposition header for 53005 and 310120
smain@google.com [Thu, 23 Oct 2014 07:55:15 +0000 (07:55 +0000)]
am
9f987e0a: fix a few of the tags for helpouts compatibility
* commit '
9f987e0ac7a410a38a57a69dad1a721324bce766':
fix a few of the tags for helpouts compatibility
smain@google.com [Thu, 23 Oct 2014 07:55:12 +0000 (07:55 +0000)]
am
54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
* commit '
545049665ce3b1cd5a8da44963f849e23aca4412':
some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
Joe Fernandez [Thu, 23 Oct 2014 07:03:15 +0000 (07:03 +0000)]
Merge "docs: Add Wear App Quality checklist" into lmp-dev
Luan Nguyen [Tue, 21 Oct 2014 23:24:22 +0000 (16:24 -0700)]
docs: Add Wear App Quality checklist
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
Jae Seo [Thu, 23 Oct 2014 06:51:08 +0000 (06:51 +0000)]
Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev
Jae Seo [Wed, 22 Oct 2014 22:38:28 +0000 (15:38 -0700)]
Update documentation for notifyTracksChanged() and notifyTrackSelected()
Bug:
18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
Trevor Johns [Thu, 23 Oct 2014 06:15:32 +0000 (06:15 +0000)]
Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
Joe Fernandez [Thu, 23 Oct 2014 04:39:23 +0000 (04:39 +0000)]
Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
Luan Nguyen [Mon, 13 Oct 2014 18:59:33 +0000 (11:59 -0700)]
docs: Add article describing Location API for Android Wear.
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
Trevor Johns [Thu, 23 Oct 2014 03:53:31 +0000 (20:53 -0700)]
Docs: Update /samples/new/index.html for Clockwork Beryl release
Added SpeedTracker sample to list of new samples.
Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
Joe Fernandez [Thu, 23 Oct 2014 03:14:33 +0000 (03:14 +0000)]
Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
Svet Ganov [Thu, 23 Oct 2014 01:55:42 +0000 (01:55 +0000)]
Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev
Eric Rowe [Thu, 23 Oct 2014 01:41:17 +0000 (01:41 +0000)]
Merge "Add delay in ping connectivity test retry" into lmp-dev
Eric Rowe [Thu, 23 Oct 2014 01:34:43 +0000 (18:34 -0700)]
Add delay in ping connectivity test retry
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
Alan Viverette [Thu, 23 Oct 2014 01:29:05 +0000 (01:29 +0000)]
Merge "Use correct smooth scroll default duration" into lmp-mr1-dev
Alan Viverette [Thu, 23 Oct 2014 01:28:49 +0000 (01:28 +0000)]
Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev
smain@google.com [Thu, 23 Oct 2014 00:58:50 +0000 (17:58 -0700)]
update android workplace screenshot
bug:
18038081
Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
Nancy Chen [Thu, 23 Oct 2014 00:42:23 +0000 (00:42 +0000)]
Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev
Rich Slogar [Wed, 22 Oct 2014 21:10:16 +0000 (14:10 -0700)]
docs:Build tools revisions 21.01 and 21.02
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
Craig Mautner [Thu, 23 Oct 2014 00:26:05 +0000 (00:26 +0000)]
Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev
Ye Wen [Thu, 23 Oct 2014 00:23:27 +0000 (00:23 +0000)]
Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
Alan Viverette [Thu, 23 Oct 2014 00:20:17 +0000 (17:20 -0700)]
Lighten action bar on light theme, use secondary color for subtitle
Also cleans up some code in ActionBarView.
BUG:
17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
Rich Slogar [Thu, 23 Oct 2014 00:14:40 +0000 (00:14 +0000)]
am
1e44dc18: am
cb79d086: docs:Update 4.4W for Wear GPS suppport
* commit '
1e44dc18c865a43e8102526ab537f74e7b6271d5':
docs:Update 4.4W for Wear GPS suppport
Craig Mautner [Thu, 23 Oct 2014 00:13:57 +0000 (00:13 +0000)]
am
5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev
* commit '
5cd68ee4dfeaf74a31a0a62e5d0a60951cddc3bc':
Cherry pick task movement changes from aosp
smain@google.com [Thu, 23 Oct 2014 00:13:51 +0000 (17:13 -0700)]
fix a few of the tags for helpouts compatibility
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
smain@google.com [Thu, 23 Oct 2014 00:06:09 +0000 (00:06 +0000)]
Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
Bryce Lee [Thu, 23 Oct 2014 00:05:41 +0000 (00:05 +0000)]
Merge "resolved conflicts for merge of
f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev
Alan Viverette [Thu, 23 Oct 2014 00:05:32 +0000 (00:05 +0000)]
Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev
Alan Viverette [Thu, 23 Oct 2014 00:04:03 +0000 (00:04 +0000)]
Merge "Ensure AdapterView doesn't post selection notifications forever" into lmp-mr1-dev
smain@google.com [Thu, 23 Oct 2014 00:02:43 +0000 (00:02 +0000)]
am
13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev
* commit '
13eb86a11308b2cff7159d287a79fd7cfa2b045b':
add helpouts widget to first round of pages
smain@google.com [Wed, 22 Oct 2014 23:59:14 +0000 (23:59 +0000)]
Merge "add helpouts widget to first round of pages" into lmp-dev
Rich Slogar [Wed, 22 Oct 2014 23:57:53 +0000 (23:57 +0000)]
am
cb79d086: docs:Update 4.4W for Wear GPS suppport
* commit '
cb79d0866695c5a082de02b45d50cf22a9fe8caa':
docs:Update 4.4W for Wear GPS suppport
Bryce Lee [Wed, 22 Oct 2014 23:56:08 +0000 (16:56 -0700)]
resolved conflicts for merge of
f03ba4f1 to lmp-mr1-dev
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
Alan Viverette [Wed, 22 Oct 2014 23:51:32 +0000 (23:51 +0000)]
Revert "Check MenuItem.isVisible() for keyboard shortcuts"
Just kidding we do want this to work like it used to.
This reverts commit
e354a9e4da56da45d7035e1e93301554c5faf32e.
Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
Ye Wen [Wed, 22 Oct 2014 23:19:05 +0000 (16:19 -0700)]
Disable Content-Disposition header for 53005 and 310120
Platform PDU lib uses a flag in frameworks/base/core resources
instead of mms config in mms service
b/
17634414
Change-Id: I0ba78d6b7d6f2844eafa3dac3691828414975f43
Alan Viverette [Wed, 22 Oct 2014 23:19:57 +0000 (16:19 -0700)]
Use correct smooth scroll default duration
BUG:
18092378
Change-Id: I503677129edb647b7970b4e39a175289d5798e1b
Svetoslav [Wed, 22 Oct 2014 22:24:58 +0000 (22:24 +0000)]
Merge "Grant the shell user a permission to let apps host widgets." into lmp-mr1-dev
Rich Slogar [Wed, 22 Oct 2014 22:11:55 +0000 (15:11 -0700)]
docs:Update 4.4W for Wear GPS suppport
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
Wale Ogunwale [Wed, 22 Oct 2014 22:17:18 +0000 (22:17 +0000)]
Merge "Fix issue #
17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 22:06:25 +0000 (22:06 +0000)]
Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev
Aravind Akella [Wed, 22 Oct 2014 22:02:18 +0000 (22:02 +0000)]
Merge "Change body sensor permission string." into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 21:53:03 +0000 (21:53 +0000)]
Merge "Decoder only returns true on complete success." into lmp-mr1-dev
Aravind Akella [Tue, 21 Oct 2014 18:07:20 +0000 (11:07 -0700)]
Change body sensor permission string.
Change-Id: If02ac48bfa6f1bd87616f89d6e7d0881c4d30967
Bug:
18023754
xin He [Wed, 22 Oct 2014 21:22:18 +0000 (21:22 +0000)]
am
265e3da0: am
5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
* commit '
265e3da00668a0769be331349541050dd6603c2b':
Show ProgressDialog when waiting for radio to turn on when provisioning.
Ricardo Cervera [Wed, 22 Oct 2014 20:48:39 +0000 (20:48 +0000)]
am
e9438c7b: am
0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
* commit '
e9438c7b17caf0253427031a010456f594741616':
docs: Removing extra semicolons in Wear notif examples.
Quddus Chong [Wed, 22 Oct 2014 20:48:35 +0000 (20:48 +0000)]
am
52357721: am
b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
* commit '
523577213072d63f6775ea3155bfc93080314494':
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
John Reck [Wed, 22 Oct 2014 20:48:27 +0000 (20:48 +0000)]
am
36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
36c2aa4a6394047f02c4f236233b41d738ff56c1':
Surface:lockHardwareCanvas DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 20:48:22 +0000 (20:48 +0000)]
am
c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c9e4f942276506c25922e0d61a3978cc2b1c9bc6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 20:48:15 +0000 (20:48 +0000)]
am
b571b926: (-s ours) Import translations. DO NOT MERGE
* commit '
b571b926f00aee176792aedd964de8230c75c401':
Import translations. DO NOT MERGE
Deepanshu Gupta [Wed, 22 Oct 2014 20:47:37 +0000 (20:47 +0000)]
am
37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge:
568f16c
* commit '
37779f07496462afa4b5d88725e8a004a7e10bc0':
Check Bridge init before disposing.
Jinsuk Kim [Wed, 22 Oct 2014 20:47:34 +0000 (20:47 +0000)]
am
07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge:
0c74939 -s ours
* commit '
07b481a9f77a7ac0dc430706aadfa262802cfdba':
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
Santos Cordon [Wed, 22 Oct 2014 20:47:15 +0000 (20:47 +0000)]
am
40f15895: am
028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '
40f158954491c4d2587e0b2a13cd07195bc27b25':
Add hidden method to access a connection's service.
Filip Gruszczynski [Wed, 22 Oct 2014 20:45:59 +0000 (20:45 +0000)]
am
baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev
* commit '
baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
Disable activity's translucency until it starts being swiped away.
Guang Zhu [Wed, 22 Oct 2014 20:45:55 +0000 (20:45 +0000)]
am
55bc7dc4: am
ccbeb61a: Block monkey from creating user profiles
* commit '
55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c':
Block monkey from creating user profiles
Adrian Roos [Wed, 22 Oct 2014 20:45:26 +0000 (20:45 +0000)]
am
c19586a8: am
7b4a38b1: Delay discovery of system trust agents
* commit '
c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
Delay discovery of system trust agents
Craig Mautner [Wed, 22 Oct 2014 20:38:04 +0000 (20:38 +0000)]
Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev
Bryce Lee [Wed, 22 Oct 2014 20:33:07 +0000 (20:33 +0000)]
Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev
Nancy Chen [Wed, 22 Oct 2014 01:36:39 +0000 (18:36 -0700)]
Add an option to set the selected phone account as the default. (1/3)
Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.
Bug:
18078232
Change-Id: I2689bc9611366d521dfd3dc2086fd31eb6393876
Craig Mautner [Wed, 22 Oct 2014 20:21:22 +0000 (13:21 -0700)]
Cherry pick task movement changes from aosp
The following cherry picks from aosp contain code that keep windows
tracking the task movement.
https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930
Maybe fixes bug
15729183.
Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
Christopher Tate [Wed, 22 Oct 2014 20:27:14 +0000 (20:27 +0000)]
Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev
Alan Viverette [Wed, 22 Oct 2014 20:03:45 +0000 (20:03 +0000)]
Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
John Reck [Wed, 22 Oct 2014 18:32:27 +0000 (11:32 -0700)]
Fix damage bug
Bug:
18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
Leon Scroggins III [Wed, 22 Oct 2014 18:11:36 +0000 (14:11 -0400)]
Remove outdated tests for custom decoder.
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.
Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.
BUG:
17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
Christopher Tate [Mon, 20 Oct 2014 23:29:20 +0000 (16:29 -0700)]
Don't cancel scheduled jobs when packages are updated
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.
Bug
18059252
Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
Christopher Tate [Wed, 22 Oct 2014 17:36:42 +0000 (10:36 -0700)]
Fix settings db update sequence
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.
Bug
18069830
Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
xin He [Wed, 22 Oct 2014 17:22:51 +0000 (17:22 +0000)]
am
5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
* commit '
5085c4c2933219831bde11a482c8b2934e4a259f':
Show ProgressDialog when waiting for radio to turn on when provisioning.
xin He [Wed, 22 Oct 2014 17:19:24 +0000 (17:19 +0000)]
Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
Ricardo Cervera [Wed, 22 Oct 2014 17:06:56 +0000 (17:06 +0000)]
am
0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
* commit '
0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
docs: Removing extra semicolons in Wear notif examples.
Ricardo Cervera [Wed, 22 Oct 2014 17:03:43 +0000 (17:03 +0000)]
Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
Quddus Chong [Wed, 22 Oct 2014 17:01:51 +0000 (17:01 +0000)]
am
b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
* commit '
b8796e441ce8b4f2e2f75df9689637f6e18f18db':
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
smain@google.com [Mon, 20 Oct 2014 21:29:22 +0000 (14:29 -0700)]
add helpouts widget to first round of pages
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
OSDN Git Service
