Baligh Uddin
b3000f3a5a
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
2015-09-27 15:12:18 +00:00
Baligh Uddin
fe23f6b1b5
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
2015-09-27 03:31:43 +00:00
Baligh Uddin
e21d43d0e5
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
2015-09-27 03:26:45 +00:00
Baligh Uddin
ba12bff7c5
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
2015-09-27 03:26:45 +00:00
Baligh Uddin
bb60d4dc82
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
2015-09-27 03:21:06 +00:00
Baligh Uddin
280b5c67d3
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
2015-09-27 03:21:06 +00:00
Baligh Uddin
85951318b7
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
2015-09-27 03:15:32 +00:00
Baligh Uddin
d01076790d
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
2015-09-27 03:14:29 +00:00
Baligh Uddin
5f6fe4e682
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
2015-09-27 03:14:10 +00:00
Baligh Uddin
23adae1332
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
2015-09-27 03:10:00 +00:00
Baligh Uddin
75c4aa2124
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
2015-09-27 03:09:13 +00:00
Baligh Uddin
21aadff0fe
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
2015-09-27 03:06:37 +00:00
Baligh Uddin
4fdde2b56f
am 2b802ceb
: (-s ours) am cd6e6034
: (-s ours) am d0d54fc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2b802ceb328658fa18e007f859bda47a755dce30':
Import translations. DO NOT MERGE
2015-09-27 03:04:11 +00:00
Baligh Uddin
e50e0b49b5
am ec981982
: (-s ours) am 9b9d77f1
: (-s ours) am 15243a26
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ec9819828df47813168d99fd2905b98a230a5d6f':
Import translations. DO NOT MERGE
2015-09-27 03:03:44 +00:00
Baligh Uddin
9c4718485e
am 586c0605
: (-s ours) am 08516de0
: (-s ours) am ad7342ec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '586c0605d888e7b5d4bd32120784866f2e9fe67a':
Import translations. DO NOT MERGE
2015-09-27 02:59:38 +00:00
Baligh Uddin
2b802ceb32
am cd6e6034
: (-s ours) am d0d54fc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
Import translations. DO NOT MERGE
2015-09-27 02:57:14 +00:00
Baligh Uddin
ec9819828d
am 9b9d77f1
: (-s ours) am 15243a26
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9b9d77f163b65057540b37ac4f6732f01f2b2e40':
Import translations. DO NOT MERGE
2015-09-27 02:56:45 +00:00
Baligh Uddin
586c0605d8
am 08516de0
: (-s ours) am ad7342ec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '08516de0fe70780281bc817249fa6dce09b71889':
Import translations. DO NOT MERGE
2015-09-27 02:53:00 +00:00
Baligh Uddin
9b9d77f163
am 15243a26
: (-s ours) Import translations. DO NOT MERGE
...
* commit '15243a260c8accf0a1fc999282a10d1ecec334b6':
Import translations. DO NOT MERGE
2015-09-27 02:50:43 +00:00
Baligh Uddin
cd6e60343a
am d0d54fc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd0d54fc1c54a046eaf919978d584fa3528c36e24':
Import translations. DO NOT MERGE
2015-09-27 02:49:56 +00:00
Baligh Uddin
08516de0fe
am ad7342ec
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ad7342ec09fb5a6fb28e84d0d93603f8d40ff225':
Import translations. DO NOT MERGE
2015-09-27 02:49:12 +00:00
Baligh Uddin
f805d2f812
Merge "Import translations. DO NOT MERGE"
2015-09-27 02:45:52 +00:00
Baligh Uddin
18c7199692
am 8309f1d7
: (-s ours) am 6d85c058
: (-s ours) am 6edd7628
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8309f1d7a758488a89368640e61ce53c5d85872a':
Import translations. DO NOT MERGE
2015-09-26 16:26:45 +00:00
Baligh Uddin
8309f1d7a7
am 6d85c058
: (-s ours) am 6edd7628
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6d85c058a8513f4f60f3a66fc80bc0010bcc5b23':
Import translations. DO NOT MERGE
2015-09-26 16:21:35 +00:00
Baligh Uddin
6d85c058a8
am 6edd7628
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6edd7628fa4786c09c35222b490fae29fafd4181':
Import translations. DO NOT MERGE
2015-09-26 16:14:28 +00:00
Bart Sears
3ecabc5411
Merge "Revert "Moved restricted profile setup logic to UserManagerService""
2015-09-26 02:02:14 +00:00
Bart Sears
fbd126e423
Revert "Moved restricted profile setup logic to UserManagerService"
...
This reverts commit 151dffcd64
.
Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
2015-09-26 02:00:46 +00:00
Fyodor Kupolov
d905197f56
Merge "Moved restricted profile setup logic to UserManagerService"
2015-09-25 22:48:04 +00:00
Baligh Uddin
6edd7628fa
Import translations. DO NOT MERGE
...
Change-Id: Iab766ad3ea1ff44ff2c30a8f9e6c95a03bebea62
Auto-generated-cl: translation import
2015-09-25 14:44:41 -07:00
Baligh Uddin
72372d9398
Import translations. DO NOT MERGE
...
Change-Id: Ia81b1f26cc4559a1b72b024249757a190ea87764
Auto-generated-cl: translation import
2015-09-25 14:12:22 -07:00
Baligh Uddin
d0d54fc1c5
Import translations. DO NOT MERGE
...
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
2015-09-25 13:23:31 -07:00
Baligh Uddin
ad7342ec09
Import translations. DO NOT MERGE
...
Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import
2015-09-25 13:14:23 -07:00
Baligh Uddin
15243a260c
Import translations. DO NOT MERGE
...
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
2015-09-25 13:05:09 -07:00
Baligh Uddin
a245d7a1da
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
2015-09-25 19:00:03 +00:00
Maurice Lam
694a76ac69
am 0764cbf4
: am 177db306
: am 2fd785e0
: am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '0764cbf4025d1e756347f4c46abe94faff10977c':
[Fingerprint] Fix link accessibility
2015-09-25 19:00:02 +00:00
Baligh Uddin
8d58a9b23b
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
2015-09-25 18:08:38 +00:00
Maurice Lam
0764cbf402
am 177db306
: am 2fd785e0
: am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '177db306c5b623409abac10b58914a0350f50b87':
[Fingerprint] Fix link accessibility
2015-09-25 18:07:45 +00:00
Baligh Uddin
44ac3d43ed
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
2015-09-25 03:16:27 +00:00
Baligh Uddin
02039b2b2d
am 8151c82b
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '8151c82b5354f8526aa2856100df819cd3230472':
Import translations. DO NOT MERGE
2015-09-25 03:05:26 +00:00
Baligh Uddin
8151c82b53
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:58:35 +00:00
Baligh Uddin
35b4e051fc
Import translations. DO NOT MERGE
...
Change-Id: I8dbabeae97d242d546a379cdd2cea75fceb8bec9
Auto-generated-cl: translation import
2015-09-24 19:56:50 -07:00
Maurice Lam
177db306c5
am 2fd785e0
: am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '2fd785e099003aad2c2537938cd8945b32cb90ab':
[Fingerprint] Fix link accessibility
2015-09-25 01:08:58 +00:00
Maurice Lam
2fd785e099
am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '655ddae8b52191633f0052617feb511b0bc02945':
[Fingerprint] Fix link accessibility
2015-09-25 01:01:57 +00:00
Maurice Lam
655ddae8b5
[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
2015-09-24 16:28:27 -07:00
Xiaohui Chen
78873951d4
Merge "A tiny refactor in settings"
2015-09-24 21:24:36 +00:00
Fyodor Kupolov
151dffcd64
Moved restricted profile setup logic to UserManagerService
...
Bug: 24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
2015-09-24 12:59:34 -07:00
Jason Monk
7eda07bc5f
resolved conflicts for e0d175ed
to master
...
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
2015-09-23 18:55:44 -04:00
Lifu Tang
4148f17616
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
2015-09-23 14:16:13 -07:00
Jason Monk
e0d175edc6
am 9f773870
: am 3b06fd8b
: am 16a8e8d1
: Make picture color mode less of a feature
...
* commit '9f773870361cb11729c6997e943a4e540324ea02':
Make picture color mode less of a feature
2015-09-23 21:00:23 +00:00
Jason Monk
9f77387036
am 3b06fd8b
: am 16a8e8d1
: Make picture color mode less of a feature
...
* commit '3b06fd8b9dc59acf31e61c48e4c8fefd110c1f0f':
Make picture color mode less of a feature
2015-09-23 20:50:38 +00:00