summaryrefslogtreecommitdiffstats
path: root/packages/BackupRestoreConfirmation
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-281-16/+12
| | | | Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
* Automatic translation importAbhisek Devkota2017-02-191-0/+38
| | | | Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
* Automatic translation importpinky@build012016-09-271-2/+0
| | | | | Change-Id: I77a3c0eb997d6f2aaf9b1add59480c496e55e43d Ticket: -
* Automatic translation importpinky@build012016-08-273-0/+114
| | | | | Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: -
* Fix NL translation after r22 revertMichael Bestas2016-05-221-4/+4
| | | | Change-Id: I0278fde16d31573a1f344b4d725ef65b5b43a7ff
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0412-21/+61
| | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
* Automatic translation importMichael Bestas2016-04-161-0/+38
| | | | Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454
* Automatic translation importMichael Bestas2016-04-061-0/+38
| | | | Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320
* Automatic translation importMichael Bestas2016-03-282-0/+76
| | | | Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2
* Automatic translation importMichael Bestas2016-03-1813-0/+386
| | | | Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1112-61/+21
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
* | Automatic translation importMichael Bestas2016-02-141-0/+19
| | | | | | | | Change-Id: I6f7e9a4d7d72272d445319a26b386d7098aa26a4
* | Automatic translation importMichael Bestas2015-12-256-0/+191
| | | | | | | | Change-Id: I96f3c5a41d3c52473c161aaf2c97d821caa99bb9
* | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-2/+2
| | | | | | | | | | Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2015-09-185-12/+51
| | | | | | | | | | Change-Id: I9aa0f770c1b5b738d9210fd95bab56d8ddb793e1 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-116-8/+8
| | | | | | | | | | Change-Id: I44c6ca4646a822b04b8b047e83622b7de1d36b15 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+1
| | | | | | | | | | Change-Id: Ifde28ca81052a95d8216d8dbd119c07f99ae08e8 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-141-1/+1
|/ | | | | Change-Id: I67b89c7404834f90bd632fdb0fa400187902a0f1 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+117
| | | | | Change-Id: Ibe34266cd7076ba077fae3f629eeda6c4bc583cf Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+39
| | | | | Change-Id: Ia6706068d602792edfbbca15f3832b0447b9b13e Auto-generated-cl: translation import
* am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not ↵Christopher Tate2015-01-281-15/+36
|\ | | | | | | | | | | | | | | | | just in effect" into lmp-mr1-dev automerge: 134aedd * commit '134aedd2c9bce194a5c826fe7a9a7389edd8bcad': Enforce backup encryption in the UI, not just in effect
| * am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not ↵Christopher Tate2015-01-281-15/+36
| |\ | | | | | | | | | | | | | | | | | | just in effect" into lmp-mr1-dev * commit '46e657bdbc4323fcab14882f87ece86bc8838892': Enforce backup encryption in the UI, not just in effect
| | * am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" ↵Christopher Tate2015-01-281-15/+36
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '26faa0be670484b3f32b9e4b07533c3fbef540f5': Enforce backup encryption in the UI, not just in effect
| | | * Enforce backup encryption in the UI, not just in effectChristopher Tate2015-01-271-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encryption is required when using 'adb backup' on encrypted devices, but the UI has not been enforcing this. The failure mode is quite confusing: the user can tap "back up my data" with no encryption phrase supplied, and the confirmation activity disappears, but the backup doesn't actually happen. We now disallow confirming the backup unless a non-empty passphrase has been entered into the UI. In addition, tapping "do not back up my data" now finishes the confirmation activity instead of just leaving it in a confusing "dead" state. Bug 19081192 Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0
| | | * Import translations. DO NOT MERGEBaligh Uddin2014-12-028-19/+13
| | |/ | | | | | | | | | | | | Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-3133-66/+33
| | | | | | | | | | | | | | | Change-Id: Ife51e0b742f8fc1809ac53d676d3644b06cd8789 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-2633-66/+33
| | | | | | | | | | | | | | | Change-Id: Ie9641c36b244cf85d9a5d17b2185f7c26d1b4ec3 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-2472-17/+161
| | | | | | | | | | | | | | | Change-Id: I27c8c543212829794bec781cb543af3d7169ca7f Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-12/+12
| | | | | | | | | | | | | | | Change-Id: I01111253b2616daa695fdc071b875033e3badceb Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-12/+12
| | | | | | | | | | | | | | | Change-Id: I92a69ec4b6384998d842369bda0531a8c5ce7825 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-231-12/+12
| | | | | | | | | | | | | | | Change-Id: Ie3c6d7239fc0f85e1703332c816edf8b19d9fa5d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-12/+12
| | | | | | | | | | | | | | | Change-Id: I16b3f82e2a714a9923536d48878b83c7386db088 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-12/+12
| | | | | | | | | | | | | | | Change-Id: Ie8b247004f28c7a44fd056738ba9f2330da56286 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-12/+12
| | | | | | | | | | | | | | | Change-Id: Ia92402bb490311215e91b6d51c40a3e4ae51c3b1 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-12/+12
| | | | | | | | | | | | | | | Change-Id: Icd6c1b82cc23c4b1e5bef13ddab6452a668b70c3 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-12/+12
| | | | | | | | | | | | | | | Change-Id: I07b99f45186c288023bf5f46d54d60263ef2bd02 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-12/+12
| | | | | | | | | | | | | | | Change-Id: I9d2ed029cfe9188b804925aa8acf3f82a42011bf Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-12/+12
| | | | | | | | | | | | | | | Change-Id: I4ac9099171c7deb2e9f56f29cb8a3a124e54e45c Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-09-302-7/+7
| | | | | | | | | | | | | | | Change-Id: Iff9cd1178b0a25f2bfa55d6c7b836566e6448a9b Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-09-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I91468d1628ca3e6585b657532166fd8bc3fb3dac Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-3139-78/+39
| | | | | | | | | | | | | | | Change-Id: I5255b957d79b591d031623d77ba9fd137f1f4fcd Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-2672-17/+128
| | | | | | | | | | | | | | | Change-Id: I5b9018113012b54fa505f2c734fed0316daead7b Auto-generated-cl: translation import
* | | am bee67db7: am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted ↵Paul Lawrence2014-08-252-18/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | case" into lmp-dev * commit 'bee67db720e33f830714f4bada6f712a25dd7fad': Fix adb backup for encrypted case
| * | am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-devPaul Lawrence2014-08-232-18/+12
| |\ \ | | |/ | | | | | | | | | * commit 'b34de6be2ede2e31a79958d6a2e6c53761c92d04': Fix adb backup for encrypted case
| | * Fix adb backup for encrypted casePaul Lawrence2014-08-222-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior. Backup no longer uses the encryption password. This is in part because that is hard with patterns, in part because it is a security issue - the off line backup is much easier to brute force than the phone. Instead, we simply insist on an encryption password if your device is encrypted and locked. Bug: 17159330 Change-Id: Ia22f84722522abf0b569a3ef1e16ead5527c726d
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-151-11/+11
| |/ | | | | | | | | Change-Id: I331a48ef418aa24e80bf690a566dd970e7a2b398 Auto-generated-cl: translation import
| * Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin2014-07-1711-418/+0
| |\
| | * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-418/+0
| | | | | | | | | | | | Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
| * | Import translations. DO NOT MERGEBaligh Uddin2014-07-191-2/+2
| |/ | | | | | | | | Change-Id: Iccd6de29591b724ac87fbd83638f5eb256daceb1 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-08-181-11/+11
| | | | | | | | | | Change-Id: Idfd90528caaa439b611e6eb804ef87ccfdde2a6a Auto-generated-cl: translation import