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
Jason Monk
3b06fd8b9d
am 16a8e8d1: Make picture color mode less of a feature
...
* commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
Make picture color mode less of a feature
2015-09-23 20:44:16 +00:00
Jason Monk
16a8e8d102
Make picture color mode less of a feature
...
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
2015-09-23 16:08:13 -04:00
Baligh Uddin
43014ea5bf
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
2015-09-23 19:52:16 +00:00
Baligh Uddin
0199eb6169
am 32981879: (-s ours) am e9983b1e: (-s ours) am 3d7c4d57: (-s ours) Import translations. DO NOT MERGE
...
* commit '329818791153d632556cf3172dc9cb44d0046fde':
Import translations. DO NOT MERGE
2015-09-23 17:59:19 +00:00
Baligh Uddin
3298187911
am e9983b1e: (-s ours) am 3d7c4d57: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e9983b1ec3f4d6c64a48fe2946bf15ca4adef35e':
Import translations. DO NOT MERGE
2015-09-23 17:43:10 +00:00
Baligh Uddin
e9983b1ec3
am 3d7c4d57: (-s ours) Import translations. DO NOT MERGE
...
* commit '3d7c4d57c4bccb63e156ca5aa0fd01732bdc05ac':
Import translations. DO NOT MERGE
2015-09-23 17:25:12 +00:00
Baligh Uddin
3d7c4d57c4
Import translations. DO NOT MERGE
...
Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80
Auto-generated-cl: translation import
2015-09-22 22:02:21 -07:00
Jim Miller
fa7f9b47f4
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
2015-09-23 02:31:18 +00:00
Jim Miller
e214210c3f
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
2015-09-23 02:23:58 +00:00
Jim Miller
a564c95067
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
2015-09-23 02:11:39 +00:00
Jim Miller
71cfa2f794
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
2015-09-23 02:04:51 +00:00
Jim Miller
c5fa6e26df
Add a dummy string to help to add "fingerprint" to search
...
Fixes bug 24172006
Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
2015-09-22 18:30:13 -07:00
Alex Klyubin
0cfcb83520
am 479db35a: am f2ae4cb7: am 12b06cb6: am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
...
* commit '479db35ad3265e9a0f59dd40bbddc5a13c6b5919':
Fix MMS delivery issue by permitting HTTP from Settings app.
2015-09-22 20:05:39 +00:00
Xiaohui Chen
aa38035ef5
Merge "Cleanup OWNER in Settings"
2015-09-22 18:14:16 +00:00
Alex Klyubin
479db35ad3
am f2ae4cb7: am 12b06cb6: am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
...
* commit 'f2ae4cb731a2bc45db3060fa84d372dbc3358909':
Fix MMS delivery issue by permitting HTTP from Settings app.
2015-09-22 17:30:56 +00:00
Alex Klyubin
f2ae4cb731
am 12b06cb6: am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
...
* commit '12b06cb6c0e09c997ab32dd5ee5be78abc78c50e':
Fix MMS delivery issue by permitting HTTP from Settings app.
2015-09-22 17:24:16 +00:00
Alex Klyubin
12b06cb6c0
am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
...
* commit '7709f92dc0759f1c383f16ccef6bb0e408c0f085':
Fix MMS delivery issue by permitting HTTP from Settings app.
2015-09-22 17:16:28 +00:00
Alex Klyubin
7709f92dc0
Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
2015-09-22 17:09:24 +00:00
Zach Jang
562251a0bd
am 0347c7e6: (-s ours) am 00108830: am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0347c7e6384a3561b1b75e1f709b0be6e93be750':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:09:14 +00:00
Zach Jang
21e0cf9558
am 30602632: (-s ours) am 4925e623: am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '306026329fa055532d1cdf2840af98fb1705de9b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:09:12 +00:00
Zach Jang
0347c7e638
am 00108830: am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '00108830be3293244b3f5e53bb2a681980ba58e5':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:02:11 +00:00
Zach Jang
306026329f
am 4925e623: am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '4925e6234f522ee7d3c2b20ed9617df0759c0ae0':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:02:09 +00:00
Zach Jang
00108830be
am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0acd070f559ba464378c2871733b0ba3a07514f2':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:52:33 +00:00
Zach Jang
4925e6234f
am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0ac53af01a8c644925f9d30596de7a36ec5ef5b8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:52:32 +00:00
Zach Jang
0acd070f55
am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '61b8955c86a9c949888949be91c06fadf04890cb':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:44:49 +00:00
Zach Jang
0ac53af01a
am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '825518b7b996d5d8df84f801b3d1725e786f132f':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:44:48 +00:00
Zach Jang
61b8955c86
am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '8fef0576518fa9baaf701e1da5564c2f6f2d9645':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:37:15 +00:00
Zach Jang
825518b7b9
am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '2ead093496c3b5b266c21a483c4f0c37869d57de':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:37:14 +00:00
Zach Jang
8fef057651
am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '7b2994d2e87eafe84425666aba8f818e661a6fac':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:30:07 +00:00
Zach Jang
2ead093496
am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '386c7763eb8cd3e856a26fe3cbd39cc573978c29':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:30:06 +00:00
Zach Jang
7b2994d2e8
am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:16 +00:00
