OSDN Git Service
Geoff Mendal [Wed, 30 Sep 2015 20:36:52 +0000 (20:36 +0000)]
am
205365eb: (-s ours) am
7b03d10f: (-s ours) am
21416b83: (-s ours) am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
205365eb482dcb4ec86be53e2b073269c7aabf6a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 20:27:37 +0000 (20:27 +0000)]
am
7b03d10f: (-s ours) am
21416b83: (-s ours) am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
7b03d10f58453873e1527384e9cdc579858d9d67':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 20:21:19 +0000 (20:21 +0000)]
am
21416b83: (-s ours) am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
21416b8318ae2dd63296a255ae8bc0f0bdda1fa4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 20:11:24 +0000 (20:11 +0000)]
am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1207a50100bbb3aaa55fc6394e13ad18fc019f8e':
Import translations. DO NOT MERGE
Julia Reynolds [Wed, 30 Sep 2015 18:13:47 +0000 (18:13 +0000)]
Merge "Use public APIs for modifying automatic zen rules."
Geoff Mendal [Wed, 30 Sep 2015 16:48:17 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:42:27 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 13:54:49 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 30 Sep 2015 13:51:56 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic5bf85d4dc5a61e5dddbf8d75c9cc5799ca0124c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 13:19:49 +0000 (13:19 +0000)]
am
883773ff: (-s ours) am
48fab9d1: (-s ours) am
82c45e07: (-s ours) am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
883773ff19de8dd12e8df101b30f5631b05d6118':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:14:11 +0000 (13:14 +0000)]
am
48fab9d1: (-s ours) am
82c45e07: (-s ours) am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
48fab9d10ab12fb015e964e0e766091f485843ef':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:11:18 +0000 (13:11 +0000)]
am
82c45e07: (-s ours) am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
82c45e07c2c6771142ad7b7dffaae23f9151d597':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:08:11 +0000 (13:08 +0000)]
am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
4446480e7f468afbc55fc3c18abb05ca77eb03be':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)]
am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
0929be6613afbf01c313e94f019a0a3d30c9a0a4':
Import translations. DO NOT MERGE
Julia Reynolds [Wed, 23 Sep 2015 19:42:14 +0000 (15:42 -0400)]
Use public APIs for modifying automatic zen rules.
Bug:
22977552
Change-Id: I544f1462ad77cdeb33ccff3c9de11ea37df5505d
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
dffcc532693c4bc6e07cf05ac532148612a94176':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:57:21 +0000 (12:57 +0000)]
am
e6d6fe8a: (-s ours) am
722737c4: (-s ours) am
a462b286: (-s ours) am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
e6d6fe8a6faa358e930363f706fbbd878e391b6d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:52:20 +0000 (12:52 +0000)]
am
722737c4: (-s ours) am
a462b286: (-s ours) am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
722737c43b43a5373ff8fdb21b0e6516ff1886c8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
49b491bb7634284a8622e48c88571aa59ba59ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:46:38 +0000 (12:46 +0000)]
am
a462b286: (-s ours) am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
a462b2862a8694ba76ea7ee9047eab5ce7a2f769':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
2e095fa263b0887fc55576b32625264e13fee4c7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:38:10 +0000 (12:38 +0000)]
am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
99842468d307709cc90414339aa7ddab2f08c855':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)]
am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
afc3831267c426974119608bb6c9179223532e47':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:27:22 +0000 (12:27 +0000)]
am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:21:29 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
Maurice Lam [Tue, 29 Sep 2015 17:02:43 +0000 (17:02 +0000)]
Merge "[Settings] Remove dependency from SUW nav bar"
Baligh Uddin [Tue, 29 Sep 2015 15:03:47 +0000 (15:03 +0000)]
am
26ceafbf: (-s ours) am
bb7eeade: (-s ours) Import translations. DO NOT MERGE
* commit '
26ceafbfe0f0cf02a4c1a10b1661105cdc774486':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Sep 2015 14:57:34 +0000 (14:57 +0000)]
am
bb7eeade: (-s ours) Import translations. DO NOT MERGE
* commit '
bb7eeadeccf7b7cd46b30ae1f721c8f9ddbddbeb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Sep 2015 10:27:41 +0000 (03:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I023e0203ab81ea1738c1730501a84a7719e13329
Auto-generated-cl: translation import
Maurice Lam [Mon, 28 Sep 2015 21:57:20 +0000 (14:57 -0700)]
[Settings] Remove dependency from SUW nav bar
Remove setup wizard navigation bar as one of setting's dependencies,
since all the users are using setup wizard library, which includes
the navigation bar as one of its components.
Change-Id: I4ce2b8639155b813a782115725c88d5b1c5c8bfc
Julia Reynolds [Mon, 28 Sep 2015 19:20:54 +0000 (19:20 +0000)]
Merge "Use public APIs to update DND policies."
Julia Reynolds [Mon, 28 Sep 2015 12:57:03 +0000 (08:57 -0400)]
Use public APIs to update DND policies.
Bug:
22977552
Change-Id: I42d3da4052b9212505920b30bb2e24c3e56bc603
Fyodor Kupolov [Sat, 19 Sep 2015 01:22:24 +0000 (18:22 -0700)]
Moved restricted profile setup logic to UserManagerService
Bug:
24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
Baligh Uddin [Sun, 27 Sep 2015 15:12:44 +0000 (15:12 +0000)]
am
fe23f6b1: (-s ours) am
e21d43d0: (-s ours) am
bb60d4dc: (-s ours) am
85951318: (-s ours) am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
fe23f6b1b59a54ffe16882b9e93803471405e8c5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 15:12:43 +0000 (15:12 +0000)]
am
ba12bff7: (-s ours) am
280b5c67: (-s ours) am
5f6fe4e6: (-s ours) am
75c4aa21: (-s ours) am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
ba12bff7c52800efc952414efb1bfff1072b775a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 15:12:39 +0000 (15:12 +0000)]
am
d0107679: (-s ours) am
21aadff0: (-s ours) am
9c471848: (-s ours) am
586c0605: (-s ours) am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
d01076790dfbc786b204566cd001f6b929d28ef5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 15:12:18 +0000 (15:12 +0000)]
am
18c71996: (-s ours) am
8309f1d7: (-s ours) am
6d85c058: (-s ours) am
6edd7628: (-s ours) Import translations. DO NOT MERGE
* commit '
18c71996923db09b28c64c6c0b3ef960f6d511ec':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:31:43 +0000 (03:31 +0000)]
am
e21d43d0: (-s ours) am
bb60d4dc: (-s ours) am
85951318: (-s ours) am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
e21d43d0e5b741b79b2355754782484b38c9d219':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:26:45 +0000 (03:26 +0000)]
am
bb60d4dc: (-s ours) am
85951318: (-s ours) am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
bb60d4dc826d39317f4599b8f8183a22d75e6c3f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:26:45 +0000 (03:26 +0000)]
am
280b5c67: (-s ours) am
5f6fe4e6: (-s ours) am
75c4aa21: (-s ours) am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
280b5c67d368e932c214284fe727880ccd54c704':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:21:06 +0000 (03:21 +0000)]
am
85951318: (-s ours) am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
85951318b7e2b639ac3e2c9b8fc18486038920ff':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:21:06 +0000 (03:21 +0000)]
am
5f6fe4e6: (-s ours) am
75c4aa21: (-s ours) am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
5f6fe4e68261e845022c3fdaa8ee6fc880b2e792':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:15:32 +0000 (03:15 +0000)]
am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
23adae13328e88ac38b0448a4375dcb3264839e5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:14:29 +0000 (03:14 +0000)]
am
21aadff0: (-s ours) am
9c471848: (-s ours) am
586c0605: (-s ours) am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
21aadff0fe8bbd87aa32681cead51ad025e3eb74':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:14:10 +0000 (03:14 +0000)]
am
75c4aa21: (-s ours) am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
75c4aa21246656a8f96f1c26a3cce763a7e17a7b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:10:00 +0000 (03:10 +0000)]
am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:09:13 +0000 (03:09 +0000)]
am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
e50e0b49b51f4db840bd900c50df17bcb30664a4':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:06:37 +0000 (03:06 +0000)]
am
9c471848: (-s ours) am
586c0605: (-s ours) am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
9c4718485e550449bb66e26294845de9f97a83ab':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:04:11 +0000 (03:04 +0000)]
am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
2b802ceb328658fa18e007f859bda47a755dce30':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:03:44 +0000 (03:03 +0000)]
am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
ec9819828df47813168d99fd2905b98a230a5d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:59:38 +0000 (02:59 +0000)]
am
586c0605: (-s ours) am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
586c0605d888e7b5d4bd32120784866f2e9fe67a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:57:14 +0000 (02:57 +0000)]
am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:56:45 +0000 (02:56 +0000)]
am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
9b9d77f163b65057540b37ac4f6732f01f2b2e40':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:53:00 +0000 (02:53 +0000)]
am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
08516de0fe70780281bc817249fa6dce09b71889':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:50:43 +0000 (02:50 +0000)]
am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
15243a260c8accf0a1fc999282a10d1ecec334b6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:56 +0000 (02:49 +0000)]
am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
d0d54fc1c54a046eaf919978d584fa3528c36e24':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:12 +0000 (02:49 +0000)]
am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
ad7342ec09fb5a6fb28e84d0d93603f8d40ff225':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:45:52 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 26 Sep 2015 16:26:45 +0000 (16:26 +0000)]
am
8309f1d7: (-s ours) am
6d85c058: (-s ours) am
6edd7628: (-s ours) Import translations. DO NOT MERGE
* commit '
8309f1d7a758488a89368640e61ce53c5d85872a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 26 Sep 2015 16:21:35 +0000 (16:21 +0000)]
am
6d85c058: (-s ours) am
6edd7628: (-s ours) Import translations. DO NOT MERGE
* commit '
6d85c058a8513f4f60f3a66fc80bc0010bcc5b23':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 26 Sep 2015 16:14:28 +0000 (16:14 +0000)]
am
6edd7628: (-s ours) Import translations. DO NOT MERGE
* commit '
6edd7628fa4786c09c35222b490fae29fafd4181':
Import translations. DO NOT MERGE
Bart Sears [Sat, 26 Sep 2015 02:02:14 +0000 (02:02 +0000)]
Merge "Revert "Moved restricted profile setup logic to UserManagerService""
Bart Sears [Sat, 26 Sep 2015 02:00:46 +0000 (02:00 +0000)]
Revert "Moved restricted profile setup logic to UserManagerService"
This reverts commit
151dffcd649329741d6b49f17dea4598a2ba30ec.
Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
Fyodor Kupolov [Fri, 25 Sep 2015 22:48:04 +0000 (22:48 +0000)]
Merge "Moved restricted profile setup logic to UserManagerService"
Baligh Uddin [Fri, 25 Sep 2015 21:44:41 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab766ad3ea1ff44ff2c30a8f9e6c95a03bebea62
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 21:12:22 +0000 (14:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia81b1f26cc4559a1b72b024249757a190ea87764
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:23:31 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:14:23 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:05:09 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 19:00:03 +0000 (19:00 +0000)]
am
8d58a9b2: (-s ours) am
44ac3d43: (-s ours) am
02039b2b: (-s ours) am
8151c82b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8d58a9b23bc6819d18118c0c63207ba37ca1dbd2':
Import translations. DO NOT MERGE
Maurice Lam [Fri, 25 Sep 2015 19:00:02 +0000 (19:00 +0000)]
am
0764cbf4: am
177db306: am
2fd785e0: am
655ddae8: [Fingerprint] Fix link accessibility
* commit '
0764cbf4025d1e756347f4c46abe94faff10977c':
[Fingerprint] Fix link accessibility
Baligh Uddin [Fri, 25 Sep 2015 18:08:38 +0000 (18:08 +0000)]
am
44ac3d43: (-s ours) am
02039b2b: (-s ours) am
8151c82b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
44ac3d43edf431f2fd554ec5c6d519618cdc9344':
Import translations. DO NOT MERGE
Maurice Lam [Fri, 25 Sep 2015 18:07:45 +0000 (18:07 +0000)]
am
177db306: am
2fd785e0: am
655ddae8: [Fingerprint] Fix link accessibility
* commit '
177db306c5b623409abac10b58914a0350f50b87':
[Fingerprint] Fix link accessibility
Baligh Uddin [Fri, 25 Sep 2015 03:16:27 +0000 (03:16 +0000)]
am
02039b2b: (-s ours) am
8151c82b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
02039b2b2d1a2f38d2a9856ac9c5cf95d7bca4da':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:26 +0000 (03:05 +0000)]
am
8151c82b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8151c82b5354f8526aa2856100df819cd3230472':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 02:58:35 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:50 +0000 (19:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dbabeae97d242d546a379cdd2cea75fceb8bec9
Auto-generated-cl: translation import
Maurice Lam [Fri, 25 Sep 2015 01:08:58 +0000 (01:08 +0000)]
am
2fd785e0: am
655ddae8: [Fingerprint] Fix link accessibility
* commit '
2fd785e099003aad2c2537938cd8945b32cb90ab':
[Fingerprint] Fix link accessibility
Maurice Lam [Fri, 25 Sep 2015 01:01:57 +0000 (01:01 +0000)]
am
655ddae8: [Fingerprint] Fix link accessibility
* commit '
655ddae8b52191633f0052617feb511b0bc02945':
[Fingerprint] Fix link accessibility
Maurice Lam [Thu, 24 Sep 2015 21:25:11 +0000 (14:25 -0700)]
[Fingerprint] Fix link accessibility
Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView
from setup wizard and switched fingerprint_settings_footer to use
LinkTextView, so that users can navigate to the link in TalkBack
mode.
Bug:
24343933
Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
Xiaohui Chen [Thu, 24 Sep 2015 21:24:36 +0000 (21:24 +0000)]
Merge "A tiny refactor in settings"
Fyodor Kupolov [Sat, 19 Sep 2015 01:22:24 +0000 (18:22 -0700)]
Moved restricted profile setup logic to UserManagerService
Bug:
24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
Jason Monk [Wed, 23 Sep 2015 22:55:44 +0000 (18:55 -0400)]
resolved conflicts for
e0d175ed to master
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
Lifu Tang [Wed, 23 Sep 2015 21:16:13 +0000 (14:16 -0700)]
Explicitly ask for option menu in Fragments
If a Fragment needs option menu, it has to ask for it explicitly by calling
setHasOptionsMenu(true). If a preference screen contains help URL, this
method is called automatically in the base class. However, if a preference
screen doesn't have help URL, this method will not be called. So any other
extra option menu will not be added correctly.
Typically we won't be able to see this bug. Because on standard Nexus builds,
all settings screen have their own help URL. But on AOSP build, as help URL
is empty by default, if the vendor doesn't modify the resource to provide
their own help URL, we'll end up missing some of the option menus.
Bug:
24241310
Change-Id: Iaabc91a1d102e21254b518ec23459025efbdcc84
Jason Monk [Wed, 23 Sep 2015 21:00:23 +0000 (21:00 +0000)]
am
9f773870: am
3b06fd8b: am
16a8e8d1: Make picture color mode less of a feature
* commit '
9f773870361cb11729c6997e943a4e540324ea02':
Make picture color mode less of a feature
Jason Monk [Wed, 23 Sep 2015 20:50:38 +0000 (20:50 +0000)]
am
3b06fd8b: am
16a8e8d1: Make picture color mode less of a feature
* commit '
3b06fd8b9dc59acf31e61c48e4c8fefd110c1f0f':
Make picture color mode less of a feature
Jason Monk [Wed, 23 Sep 2015 20:44:16 +0000 (20:44 +0000)]
am
16a8e8d1: Make picture color mode less of a feature
* commit '
16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
Make picture color mode less of a feature
Jason Monk [Wed, 23 Sep 2015 20:08:13 +0000 (16:08 -0400)]
Make picture color mode less of a feature
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug:
24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
Baligh Uddin [Wed, 23 Sep 2015 19:52:16 +0000 (19:52 +0000)]
am
0199eb61: (-s ours) am
32981879: (-s ours) am
e9983b1e: (-s ours) am
3d7c4d57: (-s ours) Import translations. DO NOT MERGE
* commit '
0199eb61699a18ee56bb53f5b159a45bdd11e864':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:59:19 +0000 (17:59 +0000)]
am
32981879: (-s ours) am
e9983b1e: (-s ours) am
3d7c4d57: (-s ours) Import translations. DO NOT MERGE
* commit '
329818791153d632556cf3172dc9cb44d0046fde':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:43:10 +0000 (17:43 +0000)]
am
e9983b1e: (-s ours) am
3d7c4d57: (-s ours) Import translations. DO NOT MERGE
* commit '
e9983b1ec3f4d6c64a48fe2946bf15ca4adef35e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:12 +0000 (17:25 +0000)]
am
3d7c4d57: (-s ours) Import translations. DO NOT MERGE
* commit '
3d7c4d57c4bccb63e156ca5aa0fd01732bdc05ac':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 05:02:21 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80
Auto-generated-cl: translation import
Jim Miller [Wed, 23 Sep 2015 02:31:18 +0000 (02:31 +0000)]
am
e214210c: am
a564c950: am
71cfa2f7: am
c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit '
e214210c3f0354bf14bb7156314b417e9af7310e':
Add a dummy string to help to add "fingerprint" to search
Jim Miller [Wed, 23 Sep 2015 02:23:58 +0000 (02:23 +0000)]
am
a564c950: am
71cfa2f7: am
c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit '
a564c950673a1d919b192f5bf3bc56e7b2f30d39':
Add a dummy string to help to add "fingerprint" to search
Jim Miller [Wed, 23 Sep 2015 02:11:39 +0000 (02:11 +0000)]
am
71cfa2f7: am
c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit '
71cfa2f7947d618d3ec3215492e82517e85e3c25':
Add a dummy string to help to add "fingerprint" to search
Jim Miller [Wed, 23 Sep 2015 02:04:51 +0000 (02:04 +0000)]
am
c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit '
c5fa6e26dffd43d8fab12117d7994d8ab6466048':
Add a dummy string to help to add "fingerprint" to search
Jim Miller [Wed, 23 Sep 2015 01:30:13 +0000 (18:30 -0700)]
Add a dummy string to help to add "fingerprint" to search
Fixes bug
24172006
Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
OSDN Git Service
