OSDN Git Service
Robert Ly [Tue, 10 Jun 2014 02:49:18 +0000 (02:49 +0000)]
am
a7ddd029: am
80e84e2d: am
f3cecfa2: am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:44:08 +0000 (02:44 +0000)]
am
80e84e2d: am
f3cecfa2: am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
80e84e2db92ba190c6c517dd4c71cd12c0adb249':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:39:28 +0000 (02:39 +0000)]
am
f3cecfa2: am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
f3cecfa2185ef5622992b21da8204b8b6590ef2d':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:36:10 +0000 (02:36 +0000)]
am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
55d525b26b716351625798675afe69c6cf43cf5a':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:32:29 +0000 (02:32 +0000)]
am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
716cc7dcac1bb9279326ab92a78a246b3a70de4e':
Add documentation for AndroidKeyStore
Justin Koh [Tue, 10 Jun 2014 01:05:05 +0000 (01:05 +0000)]
Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev
Aaron Whyte [Fri, 6 Jun 2014 23:41:38 +0000 (16:41 -0700)]
Catch OperationUnsupportedException when linkifying using WebView
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug:
15131296
Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
Justin Koh [Mon, 9 Jun 2014 21:59:17 +0000 (14:59 -0700)]
Remove WebIconDatabase calls from android.provider.Browser
This class has been deprecated, so no need to call it.
Bug:
15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
Amit Mahajan [Mon, 9 Jun 2014 19:50:09 +0000 (19:50 +0000)]
am
e5a28d34: am
20c5ce50: Handle provisioning APN by turning off/on radio.
* commit '
e5a28d34f662c469f85590dda28fc02eca12204b':
Handle provisioning APN by turning off/on radio.
Amit Mahajan [Mon, 9 Jun 2014 19:46:01 +0000 (19:46 +0000)]
am
20c5ce50: Handle provisioning APN by turning off/on radio.
* commit '
20c5ce50c456742bf912ebb915be45bfdb51487d':
Handle provisioning APN by turning off/on radio.
Justin Koh [Fri, 6 Jun 2014 19:13:16 +0000 (12:13 -0700)]
Add NPE check to getSystemWindowInsets
Bug:
15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
Justin Koh [Mon, 9 Jun 2014 18:29:39 +0000 (18:29 +0000)]
Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
Justin Koh [Mon, 9 Jun 2014 00:04:17 +0000 (17:04 -0700)]
Fix Browser when running on a platform without webview
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug:
15088030
Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
Amit Mahajan [Fri, 6 Jun 2014 23:53:34 +0000 (16:53 -0700)]
Handle provisioning APN by turning off/on radio.
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).
bug:
13190133
Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
Robert Ly [Mon, 9 Jun 2014 16:54:45 +0000 (16:54 +0000)]
am
5cb18054: am
e115755d: Merge "remove erroneous file" into klp-docs
* commit '
5cb180541332d652ed661559dfaa55a0fcc3751b':
remove erroneous file
Robert Ly [Sun, 8 Jun 2014 08:35:23 +0000 (08:35 +0000)]
am
e115755d: Merge "remove erroneous file" into klp-docs
* commit '
e115755d0fbd067a1996eb448cda58a14cce22d1':
remove erroneous file
Robert Ly [Sun, 8 Jun 2014 05:39:55 +0000 (05:39 +0000)]
Merge "remove erroneous file" into klp-docs
Robert Ly [Sun, 8 Jun 2014 05:38:18 +0000 (22:38 -0700)]
remove erroneous file
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
Adam Lesinski [Fri, 6 Jun 2014 21:13:15 +0000 (21:13 +0000)]
Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
Michael Kolb [Fri, 6 Jun 2014 15:26:17 +0000 (15:26 +0000)]
Merge "Remove circular mask" into klp-modular-dev
Vinod Krishnan [Thu, 5 Jun 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev
Prashant Malani [Thu, 5 Jun 2014 23:03:19 +0000 (23:03 +0000)]
Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
Vinod Krishnan [Thu, 5 Jun 2014 18:50:34 +0000 (11:50 -0700)]
Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486
Bug:
15087985
Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
Prashant Malani [Wed, 28 May 2014 02:23:59 +0000 (19:23 -0700)]
DO NOT MERGE Change display state modification during dozing
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.
Bug:
13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
Justin Koh [Thu, 5 Jun 2014 20:50:58 +0000 (13:50 -0700)]
DO NOT MERGE Readd removal of notification listener limit on posting
Listener packages are allowed to post > 50 notifications
This reverts commit
500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
Michael Kolb [Thu, 5 Jun 2014 16:55:31 +0000 (09:55 -0700)]
Remove circular mask
Change-Id: I83b1caea100d28be2fca46dc0280b05e9b78da44
Justin Koh [Thu, 5 Jun 2014 19:03:32 +0000 (19:03 +0000)]
Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
Justin Koh [Thu, 5 Jun 2014 19:02:47 +0000 (19:02 +0000)]
Revert "Add check to allow notification listener packages to post >50 notifications"
Broke build.
This reverts commit
2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.
Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
Justin Koh [Thu, 5 Jun 2014 18:06:45 +0000 (18:06 +0000)]
Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
Hui Lu [Thu, 5 Jun 2014 17:36:02 +0000 (17:36 +0000)]
Merge "Add interface name for proxy network type." into klp-modular-dev
Hui Lu [Tue, 3 Jun 2014 19:50:30 +0000 (15:50 -0400)]
Add interface name for proxy network type.
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b
Bug:
15320910
Justin Koh [Wed, 4 Jun 2014 20:57:49 +0000 (13:57 -0700)]
Add check to allow notification listener packages to post >50 notifications
Bug:
13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
Craig Mautner [Thu, 5 Jun 2014 03:28:21 +0000 (03:28 +0000)]
Merge "Add callback when ActivityView activities complete" into klp-modular-dev
Craig Mautner [Mon, 2 Jun 2014 22:06:40 +0000 (15:06 -0700)]
Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.
Fixes bug
15330616.
Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
Dave Holmes [Wed, 4 Jun 2014 23:41:49 +0000 (23:41 +0000)]
am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to
* commit '
4e99af342b340bebcd635137966d21c59c294532':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Dave Holmes [Wed, 4 Jun 2014 23:38:34 +0000 (23:38 +0000)]
am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building
* commit '
aabfcb78cf29e3d670831c770b9d757eb79487e4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Dave Holmes [Wed, 4 Jun 2014 23:35:50 +0000 (23:35 +0000)]
Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs
Adam Lesinski [Wed, 4 Jun 2014 22:05:56 +0000 (15:05 -0700)]
Allow for a NoOp implementation of DrmManagerClientImpl
Change-Id: I150b95790d5e6d3c0160637149f18f2194318de8
Deepanshu Gupta [Wed, 4 Jun 2014 20:48:19 +0000 (20:48 +0000)]
am
03df93bc: am
5cde33a6: am
dcfba78f: am
ed5ab0f0: am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
03df93bcb854eedc600ef0120fd238ec974c44a1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:45:02 +0000 (20:45 +0000)]
am
5cde33a6: am
dcfba78f: am
ed5ab0f0: am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:41:47 +0000 (20:41 +0000)]
am
dcfba78f: am
ed5ab0f0: am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)]
am
ed5ab0f0: am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:34:14 +0000 (20:34 +0000)]
am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:30:05 +0000 (20:30 +0000)]
am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
bad112f23f09f8839b4b7294439b0fe725cc2034':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:11 +0000 (20:29 +0000)]
am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
3ce1ca68309231e693964824917a66f36e575fd7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)]
am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
e4aa31382139ee2e319110fbfff402e0c6315952':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:03 +0000 (20:29 +0000)]
am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)]
am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
c8235b8e7446c849df10ff2f897d2a3743b4934d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:26:07 +0000 (20:26 +0000)]
am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
0ed9d498b740273fdbcdf51f55648c23df29accc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:57 +0000 (20:25 +0000)]
am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)]
am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
d49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:21:00 +0000 (20:21 +0000)]
am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
ffcad247d0401fb529441ecc65437226c2845461':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)]
am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)]
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)]
am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:26 +0000 (20:20 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:17:40 +0000 (20:17 +0000)]
am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
904b89c58465b0d0822478be514572ec752df3e8':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:37 +0000 (20:15 +0000)]
am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:33 +0000 (20:15 +0000)]
am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
12b657d74961ba5a6175162b7548cce4e77c9bbc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:14:52 +0000 (20:14 +0000)]
am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
295184bc71a32a4e9418d34b2adeb0cef4b39781':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:23 +0000 (20:11 +0000)]
am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
af3f96e4349f63f862de004853ba8e10e5ee51ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:19 +0000 (20:11 +0000)]
am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
dade24b491c82ff0b96d025c908e7eaf1bab99ba':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:10:55 +0000 (20:10 +0000)]
am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
8782a12005e90bbd49be579fb8ede3a42a007380':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:08:29 +0000 (20:08 +0000)]
am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:07:43 +0000 (20:07 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:09 +0000 (19:43 +0000)]
am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
d2dff39b587bd073fcf5c97753c8a29e16f4ef57':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:01 +0000 (12:43 -0700)]
resolved conflicts for merge of
61fb5784 to jb-mr1-dev
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
Deepanshu Gupta [Wed, 4 Jun 2014 19:38:01 +0000 (19:38 +0000)]
am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:34:15 +0000 (19:34 +0000)]
am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
f52fcc70541224c2d926f59461bde5a8bd6545a7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:32:05 +0000 (19:32 +0000)]
am
3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
* commit '
3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:31:31 +0000 (19:31 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
Andrew Solovay [Wed, 4 Jun 2014 17:40:03 +0000 (17:40 +0000)]
am
15ceb87a: am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
15ceb87a07d9ad1fba4265112492e34c5cc360f5':
docs: Fixed error in code sample.
Andrew Solovay [Wed, 4 Jun 2014 17:35:45 +0000 (17:35 +0000)]
am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
2e10cc9021b1cd3d90c55038191872f29a02c3f2':
docs: Fixed error in code sample.
Andrew Solovay [Wed, 4 Jun 2014 17:32:46 +0000 (17:32 +0000)]
Merge "docs: Fixed error in code sample." into klp-docs
Ricardo Cervera [Wed, 4 Jun 2014 17:29:36 +0000 (17:29 +0000)]
am
693a9546: am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
693a954626866e40b01264ff57fe6c336a7504a8':
docs: Added release notes for SDK Tools 22.6.4
Ricardo Cervera [Wed, 4 Jun 2014 17:24:35 +0000 (17:24 +0000)]
am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
docs: Added release notes for SDK Tools 22.6.4
Ricardo Cervera [Wed, 4 Jun 2014 17:21:38 +0000 (17:21 +0000)]
Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
Robert Ly [Wed, 4 Jun 2014 16:54:45 +0000 (16:54 +0000)]
am
dd57a6b2: am
bb33ff04: update device dashboard for June
* commit '
dd57a6b24d819bbfd9d2422f52dfb0fe9d43b3e9':
update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 16:50:26 +0000 (16:50 +0000)]
am
bb33ff04: update device dashboard for June
* commit '
bb33ff04b7d1f7f554331426bd9940edbbfd395d':
update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 15:34:40 +0000 (08:34 -0700)]
update device dashboard for June
Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765
Katie McCormick [Wed, 4 Jun 2014 12:32:09 +0000 (12:32 +0000)]
am
ea5fa98c: am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
ea5fa98c7c381a37c113b7d2efdd6a406d902949':
Doc update: new Volley class
Katie McCormick [Wed, 4 Jun 2014 12:26:44 +0000 (12:26 +0000)]
am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
c659e7465df342920f3906cbc0b024f610bf65bd':
Doc update: new Volley class
Katie McCormick [Wed, 4 Jun 2014 12:01:38 +0000 (12:01 +0000)]
Merge "Doc update: new Volley class" into klp-docs
Dave Holmes [Wed, 4 Jun 2014 07:02:25 +0000 (17:02 +1000)]
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
https://b.corp.google.com/issue?id=
14045807
Change-Id: I48e6a50f12c635cdf3dd597e4247d072bda14cc3
David Friedman [Wed, 4 Jun 2014 03:09:34 +0000 (03:09 +0000)]
am
dba68be3: am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
dba68be33efe4ee322a9ff3d895ed257162c0908':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:05:26 +0000 (03:05 +0000)]
am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
00aae2793d37ed098a80bc0a98e8008b36178714':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:01:52 +0000 (03:01 +0000)]
Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
Andrew Solovay [Tue, 3 Jun 2014 23:07:59 +0000 (16:07 -0700)]
docs: Fixed error in code sample.
The code sample didn't match the sample project. Also rewrote one
paragraph to clarify that you *create* a particular XML file (external
bug report said the file was missing from the sample project).
Also fixed formatting in a different line sample (overlong line
forced code box to scroll).
Doc is staged to:
http://asolovay.mtv:9098/training/contacts-provider/retrieve-names.html#NameMatch
bug:
15377898
Change-Id: I0898956255aa9174b12811e6f6ca826434b28c20
Dirk Dougherty [Tue, 3 Jun 2014 23:18:15 +0000 (23:18 +0000)]
am
93a27e23: am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
93a27e236b88636e68543d5edd80e5a5c176fb57':
Adjust h3 margins for dynamic content blocks.
Dirk Dougherty [Tue, 3 Jun 2014 23:13:50 +0000 (23:13 +0000)]
am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
Adjust h3 margins for dynamic content blocks.
Dirk Dougherty [Tue, 3 Jun 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
Craig Mautner [Tue, 3 Jun 2014 22:41:38 +0000 (22:41 +0000)]
Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
Deepanshu Gupta [Tue, 3 Jun 2014 21:17:09 +0000 (21:17 +0000)]
am
92641015: am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
92641015c83ec027f0d06b8047804f5ffc2dc16b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:10:10 +0000 (21:10 +0000)]
am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
5f664a1119f9008feeb924ec50c2ac896a8550db':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)]
am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2a57694d0ae30eeca7239c7efae4e6bf478b781a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:02:55 +0000 (21:02 +0000)]
am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:58:41 +0000 (20:58 +0000)]
am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
76364c6970f86bdf67622c14c9f1ebac6883998b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:54:31 +0000 (20:54 +0000)]
am
2bc3df2e: am
b97ac2b6: am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:54:29 +0000 (20:54 +0000)]
am
7e49737d: am
fb6e2f3b: am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
7e49737d80fa37731af44dff2f88a6054778f907':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)]
am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
d0f215756aa3767db8a73ece7fe9f401256dd263':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]