Geoff Mendal
e387dccbac
am 96edf807: (-s ours) Import translations. DO NOT MERGE
...
* commit '96edf8077347297d030af02a9452c726bbc421c8':
Import translations. DO NOT MERGE
2015-08-29 22:44:43 +00:00
Geoff Mendal
96edf80773
Import translations. DO NOT MERGE
...
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
2015-08-29 08:38:50 -07:00
Geoff Mendal
91971bc0e3
Import translations. DO NOT MERGE
...
Change-Id: Ia3254d8fb04749c16c9e5a123de212adce9b33f6
Auto-generated-cl: translation import
2015-08-29 07:54:23 -07:00
Fyodor Kupolov
20f6f0d31f
Merge "Use createRestrictedProfile method to create profile"
2015-08-29 00:08:20 +00:00
Fyodor Kupolov
9938f6fa45
Use createRestrictedProfile method to create profile
...
Bug: 23191995
Change-Id: I83d900b274563dc964fd07dbd0fccbdb4b275f29
2015-08-28 17:02:21 -07:00
Maurice Lam
566af8ce2a
am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '2fef059543bc859d5723246a635d0e1773f623de':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:48:17 +00:00
Maurice Lam
2fef059543
am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '07c2561d80fba5b3764177aa03dc4496cbe9b47e':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:41:42 +00:00
Maurice Lam
07c2561d80
am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:31:35 +00:00
Maurice Lam
8cea65f99f
am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
2015-08-28 22:13:19 +00:00
Xiaohui Chen
47a82b5d6d
Merge "Cleanup USER_OWNER for cryptkeeper"
2015-08-28 20:35:24 +00:00
Maurice Lam
48cf33a94e
[Fingerprint] Add skip dialog during SUW
...
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.
Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Geoff Mendal
4e95926249
am 515d5f32: (-s ours) am c350e4e1: (-s ours) am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit '515d5f32d5951fbbe310b64411a95f45a695f428':
Import translations. DO NOT MERGE
2015-08-28 10:39:38 +00:00
Geoff Mendal
515d5f32d5
am c350e4e1: (-s ours) am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c350e4e1335c0d9f89fb7be81b65baaf36a30f0f':
Import translations. DO NOT MERGE
2015-08-28 10:34:06 +00:00
Geoff Mendal
70569e65da
am 90972fe5: (-s ours) am e6d06aeb: (-s ours) am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit '90972fe51053179a4acd3376b6c40019eacf2e6d':
Import translations. DO NOT MERGE
2015-08-28 10:31:57 +00:00
Geoff Mendal
90972fe510
am e6d06aeb: (-s ours) am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e6d06aeb2c5d2a70f71aa1a5365eb2dea46692d8':
Import translations. DO NOT MERGE
2015-08-28 10:25:49 +00:00
Geoff Mendal
c350e4e133
am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit '15f11ef2470d231d495dec7df6410952f07073c2':
Import translations. DO NOT MERGE
2015-08-28 10:25:32 +00:00
Geoff Mendal
15f11ef247
am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fea2b30ac49e5075a4cc78c1e694a62334192f0a':
Import translations. DO NOT MERGE
2015-08-28 10:21:01 +00:00
Geoff Mendal
e6d06aeb2c
am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit '2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f':
Import translations. DO NOT MERGE
2015-08-28 10:20:47 +00:00
Geoff Mendal
fea2b30ac4
am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit '37dfaa13ec6882720ca100ef235a7649046aec12':
Import translations. DO NOT MERGE
2015-08-28 10:14:49 +00:00
Geoff Mendal
2751a8cf31
am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit 'db044ffbc6b90ba2730bfd7a97e0593e50d9b014':
Import translations. DO NOT MERGE
2015-08-28 10:13:21 +00:00
Geoff Mendal
db044ffbc6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
2015-08-28 03:06:04 -07:00
Geoff Mendal
37dfaa13ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
2015-08-28 03:02:07 -07:00
Xiyuan Xia
f8c1636807
am 12ec7efe: am e053491b: am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '12ec7efeb3efcaba014f9c23f0e1505d218996d4':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 02:09:11 +00:00
Xiyuan Xia
12ec7efeb3
am e053491b: am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit 'e053491bcc55ce844cd1f38dc61dac7edc15750a':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 02:04:41 +00:00
Xiyuan Xia
e053491bcc
am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit 'e927bd7014c34e6f368da9325fc78b2df5362a99':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:59:06 +00:00
Xiyuan Xia
e927bd7014
am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
2015-08-28 01:46:57 +00:00
Xiaohui Chen
b7c8fbf402
Cleanup USER_OWNER for cryptkeeper
...
Bug: 19913735
Change-Id: If8df927e72321e00bfef49a6c81953442e04969d
2015-08-27 15:46:32 -07:00
Xiyuan Xia
3e7e3d6c59
Fix ChoosePat/Pin/Pwd crash from async task
...
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.
Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
2015-08-27 13:35:55 -07:00
Sanket Padawe
024752b715
am a3618fca: am 62037449: (-s ours) am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit 'a3618fca903a5d2fd4e744e8bdd2944d57370be1':
2015-08-27 20:21:50 +00:00
Christopher Tate
28d19ae3f2
am bbacf99a: am 356e5b58: (-s ours) am ffe701dc: Present the security patch date in a human-friendly format
...
* commit 'bbacf99a638171059f5ce6743c8cff8f3daa637b':
2015-08-27 20:21:48 +00:00
Selim Cinek
411c7997a7
am 0376623a: am c877856a: (-s ours) am 19551115: Adapted string length translation limits
...
* commit '0376623ae4e8568bc0bf982ebfe9e9cf2257de7d':
2015-08-27 20:21:47 +00:00
Julia Reynolds
2de70565ad
am 09e311b9: am 42f2b354: (-s ours) am 0ece6a32: String update for battery details page.
...
* commit '09e311b9a977dcc9f89871278412142a9695728b':
2015-08-27 20:21:46 +00:00
Adam Lesinski
1cabf6855e
am 3f76d948: am f71fbbff: (-s ours) am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit '3f76d948e6f217d23fe00e0f6b6e7ac6c439b1ae':
2015-08-27 20:21:45 +00:00
Jeff Sharkey
a3879c4223
am 875b1fec: am 08fe57cb: (-s ours) am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit '875b1fec7a5f8e0b67581721d33459f85b36b338':
2015-08-27 20:21:43 +00:00
Chris Tate
9c98de114d
am e5aeeffc: am 71efd816: (-s ours) am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit 'e5aeeffcdbfdeb5fcfb05d43571b22eec399db90':
2015-08-27 20:21:42 +00:00
Jeff Sharkey
7925d2a910
am 6d1ec23f: am 38c81907: (-s ours) am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit '6d1ec23f45ce6dcf0767cf92f221f37a572a4328':
2015-08-27 20:21:40 +00:00
Geoff Mendal
440b31b986
am f1f6a0b9: (-s ours) am 36fe2c6a: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1f6a0b9204fafbf9553d2da90804d8e56e80505':
2015-08-27 20:21:39 +00:00
Dianne Hackborn
328c560d45
am 1b33e6b5: am df85a4fc: (-s ours) am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '1b33e6b5d064585c03f9a78359f369c25c2acb47':
2015-08-27 20:21:37 +00:00
Andres Morales
0d7ec9218e
am 68bf9508: am af48dffe: (-s ours) am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '68bf9508178a9fbfe89fa75bdebf5599de5155ba':
2015-08-27 20:21:36 +00:00
Dianne Hackborn
a42b6e0fac
am 9344eb45: am 7f45b55d: (-s ours) am 8500822b: Merge "Fix issue #23079119 : Description for write settings permission says..." into mnc-dev
...
* commit '9344eb4534eccfe6be89f10fc08e81f8295409aa':
2015-08-27 20:21:34 +00:00
Maurice Lam
c1336374bd
am 9ee252e8: am ef906938: (-s ours) am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '9ee252e8634961981776ca0be26b9c74e56e013f':
2015-08-27 20:21:31 +00:00
Dianne Hackborn
7c3acf5207
am 838c4a2e: am ef54ab61: (-s ours) am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit '838c4a2e70c659688a5969fbb738075ad7b824dd':
2015-08-27 20:21:28 +00:00
Dianne Hackborn
3b57ad1e70
am 9c0a7f91: am f6649472: (-s ours) am ba38155d: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '9c0a7f91a98e19cd0fedb773cf8b63c7c70464c8':
2015-08-27 20:21:25 +00:00
Dianne Hackborn
0f9e7b629c
am e81e1816: am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'e81e1816c86e27deab8935454648a2ee09130ddd':
2015-08-27 20:21:23 +00:00
Julia Reynolds
f5bc872cdd
am b88ee9bd: am 0a27e57d: (-s ours) am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit 'b88ee9bd79fd400af0593344aa9ac3109254859c':
2015-08-27 20:21:21 +00:00
Jason Monk
a221600a1e
am 06e661fa: am 656145a0: (-s ours) am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit '06e661fadc2876e51bacf087f9c889e13afc160e':
2015-08-27 20:21:20 +00:00
Pavel Zhamaitsiak
63da5b0a78
am dd38b4d4: am 667be5d6: (-s ours) am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit 'dd38b4d4ed0841f0dc898b98add67a855b4e3e62':
2015-08-27 20:21:18 +00:00
Jeff Sharkey
525b75c10c
am 5a9e0e82: am e56724ba: (-s ours) am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '5a9e0e8236dcab5e086d95c45e9b0e4ca30da88d':
2015-08-27 20:21:16 +00:00
