Commit Graph

21130 Commits

Author SHA1 Message Date
Zach Kuznia
ae8aea76e5 Merge "Allow manual to be read from disk" into mnc-dr-dev 2015-10-01 00:08:05 +00:00
Geoff Mendal
1207a50100 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-30 16:48:17 +00:00
Geoff Mendal
eb06d4a9c2 Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
2015-09-30 07:42:27 -07:00
Geoff Mendal
4446480e7f 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
2015-09-30 13:02:08 +00:00
Geoff Mendal
0929be6613 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
2015-09-30 12:57:33 +00:00
Geoff Mendal
dffcc53269 am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit 'c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
  Import translations. DO NOT MERGE
2015-09-30 12:51:15 +00:00
Geoff Mendal
c7b0a81625 am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE
2015-09-30 12:47:04 +00:00
Geoff Mendal
49b491bb76 am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '2e095fa263b0887fc55576b32625264e13fee4c7':
  Import translations. DO NOT MERGE
2015-09-30 12:41:16 +00:00
Geoff Mendal
2e095fa263 Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
2015-09-30 05:34:33 -07:00
Geoff Mendal
99842468d3 am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit 'afc3831267c426974119608bb6c9179223532e47':
  Import translations. DO NOT MERGE
2015-09-30 12:33:46 +00:00
Geoff Mendal
afc3831267 am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
  Import translations. DO NOT MERGE
2015-09-30 12:27:22 +00:00
Geoff Mendal
77fc6ac5f6 Import translations. DO NOT MERGE
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
2015-09-30 05:21:29 -07: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
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
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
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
6edd7628fa Import translations. DO NOT MERGE
Change-Id: Iab766ad3ea1ff44ff2c30a8f9e6c95a03bebea62
Auto-generated-cl: translation import
2015-09-25 14:44:41 -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
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
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
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
3d7c4d57c4 Import translations. DO NOT MERGE
Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80
Auto-generated-cl: translation import
2015-09-22 22:02:21 -07: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
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
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
Zach Jang
386c7763eb am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:13 +00:00
Alex Klyubin
f41fffb8d2 Fix MMS delivery issue by permitting HTTP from Settings app.
MMS delivery may fail on carriers which use cleartext HTTP for MMS,
due to an issue introduced in Android M. The cause is that the
platform-provided HTTP stack refuses cleartext HTTP from the MMS
service process because other packages (Settings app,
TelephonyProvider) loaded into the com.android.phone process declare
a policy that cleartext network traffic is not permitted. The issue
might be non-deterministic because the policy depends on the order in
which packages are loaded into the process.

From the perspective of platform-provided HTTP stacks, whether
cleartext HTTP traffic is permitted is a per-process setting. It is
set by the framework based on the policy of the package due to which
the process is started. Further packages loaded into the process do
not affect the per-process policy. This means all packages which may
be loaded into the same process must use the same cleartext network
traffic policy.

This fix relaxes the network security policy of the Settings app to
permit cleartext network traffic, so that all packages loaded into
the com.android.phone process uses the same policy.

Bug: 24222050
Change-Id: Id6d0018b30782c349963d92799d74266e5001729
2015-09-21 12:29:32 -07:00
Zach Jang
1304f47c1b 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 '5cac896612ead73d08acb588e2f62512f8789cf4':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612 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 '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Baligh Uddin
2d0db3098e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:07 +00:00
Paul Lawrence
0f1e7bfe19 Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev 2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7 Revert "Remove don't kill flag from CryptKeeper to stop logspam"
This reverts commit 4f60679b76.

Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
2015-09-19 02:29:37 +00:00
Jim Miller
d251fed3ef Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 2015-09-19 00:59:51 +00:00
Justin Harrison
c6a96d4076 Merge "Add color transform setting" into mnc-dr-dev 2015-09-19 00:21:45 +00:00