OSDN Git Service
Bill Yi [Wed, 13 Dec 2017 00:25:18 +0000 (16:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
Bill Yi [Fri, 8 Dec 2017 01:08:40 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9
am:
26e5f828f7
Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1
am:
db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85
am:
acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407
am:
9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207
am:
3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1
am:
24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846
am:
9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3
am:
eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383
am:
b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]
Reword bluetooth confirmation dialog
am:
e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
Antony Sargent [Fri, 1 Dec 2017 21:21:38 +0000 (21:21 +0000)]
Fix BluetoothPairingDialogTest to not expect device name
am:
f20e0a492b
Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug:
62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
Bill Yi [Tue, 14 Nov 2017 20:42:27 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
Fan Zhang [Fri, 3 Nov 2017 00:40:07 +0000 (00:40 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours am:
e981e0b855 -s ours
am:
ef61a45cf6 -s ours
Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a
Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours
am:
e981e0b855 -s ours
Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49
Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours
am:
d15a81f882 -s ours
Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016
Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours
am:
3c19043e9c -s ours
Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours
am:
e6a8f354fc -s ours
Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da
Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours
am:
dbbcf65c96 -s ours
Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf
Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours
am:
7690482014 -s ours
Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a
Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours
am:
5f02135c42 -s ours
Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411
Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours
am:
1de093b1a1 -s ours
Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81
Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours
am:
b17703e871 -s ours
Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4
Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am:
1c040c7414 -s ours
Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9
Fan Zhang [Fri, 3 Nov 2017 00:07:32 +0000 (00:07 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
Fan Zhang [Tue, 10 Oct 2017 21:06:04 +0000 (14:06 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Test: manual
Fan Zhang [Tue, 31 Oct 2017 23:15:37 +0000 (23:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours am:
7da421a293 -s ours
am:
76f30a360c -s ours
Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23
Fan Zhang [Tue, 31 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours
am:
7da421a293 -s ours
Change-Id: Ia717917794165cb2846f0836c9e42350028a3095
Fan Zhang [Tue, 31 Oct 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours
am:
9d865d0c3e -s ours
Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
Fan Zhang [Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours
am:
3d94477fb8 -s ours
Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours
am:
4d9e11990d -s ours
Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
Fan Zhang [Tue, 31 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours
am:
0c0728a947 -s ours
Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
Fan Zhang [Tue, 31 Oct 2017 22:59:07 +0000 (22:59 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5
am:
b4db530aa5 -s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
Fan Zhang [Tue, 31 Oct 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08
am:
769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
Fan Zhang [Tue, 31 Oct 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613
am:
cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
Fan Zhang [Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am:
8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
Fan Zhang [Tue, 31 Oct 2017 22:47:13 +0000 (22:47 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
Fan Zhang [Tue, 31 Oct 2017 21:29:53 +0000 (21:29 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b am:
0c59dca90d -s ours
am:
96cc88e218 -s ours
Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e
Fan Zhang [Tue, 31 Oct 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b
am:
0c59dca90d -s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
Fan Zhang [Tue, 31 Oct 2017 21:23:57 +0000 (21:23 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b
am:
adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
Fan Zhang [Tue, 31 Oct 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da
am:
80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
Fan Zhang [Tue, 31 Oct 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f
am:
e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
Fan Zhang [Tue, 31 Oct 2017 21:11:26 +0000 (21:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am:
e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
Fan Zhang [Fri, 22 Sep 2017 18:25:42 +0000 (11:25 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Fan Zhang [Tue, 31 Oct 2017 21:03:08 +0000 (21:03 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes:
64339515
Bug:
38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Fan Zhang [Tue, 31 Oct 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev
am:
e3d0bbcc80 -s ours
Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef
Fan Zhang [Tue, 31 Oct 2017 18:25:36 +0000 (18:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev
TreeHugger Robot [Tue, 31 Oct 2017 03:34:28 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 31 Oct 2017 02:37:43 +0000 (02:37 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev
Bill Yi [Tue, 31 Oct 2017 01:16:54 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If1e768b33481061f37bac9612b862ece348f15fb
Bill Yi [Fri, 27 Oct 2017 04:16:36 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit
e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit
05fa18f8474cd5fed798e7ee7ef099682c4a4475)
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
Jeff Sharkey [Wed, 11 Oct 2017 22:02:29 +0000 (22:02 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours
am:
952ae3ec34
Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
Jeff Sharkey [Wed, 11 Oct 2017 22:00:24 +0000 (22:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours
am:
0f53a56cbd
Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44
am:
e803004863 -s ours
Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
Jeff Sharkey [Wed, 11 Oct 2017 21:42:14 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb
am:
250d5e60b0 -s ours
Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6
Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79
am:
2433b6dc44
Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37
Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3
am:
3aa36a6afb
Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7
Jeff Sharkey [Wed, 11 Oct 2017 21:24:25 +0000 (21:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours
am:
47bc5fba05
Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848
Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d
am:
d721694b79
Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be
Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239
am:
53a69985b3
Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3
Jeff Sharkey [Wed, 11 Oct 2017 21:12:41 +0000 (21:12 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda
am:
efe9e7e003 -s ours
Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f
Jeff Sharkey [Wed, 11 Oct 2017 21:10:10 +0000 (21:10 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours
am:
b410435a21
Change-Id: I91421c6629af2131e7aaeadac048c92da9653212
Jeff Sharkey [Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am:
9c39da39df
Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e
am:
86cc9a681d
Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3
am:
b3d4bc8239
Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f