summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Adjust caption preset picker items dimens for MaterialAlan Viverette2014-10-212-11/+19
* Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1...John Spurlock2014-10-212-7/+4
|\
| * Settings: Display 'Calls' category on non-voice devices.John Spurlock2014-10-202-7/+4
* | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2084-697/+2685
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2014-10-2084-697/+2685
| |/
* | am bdedbb85: Merge "Changing settings UI changes related to strings to be dis...Sanket Padawe2014-10-201-2/+2
|\ \ | |/ |/|
| * Merge "Changing settings UI changes related to strings to be displayed" into ...Sanket Padawe2014-10-201-2/+2
| |\
| | * Changing settings UI changes related to strings to be displayedSanket Padawe2014-10-201-2/+2
* | | am 456b866c: am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-181-3/+3
|\ \ \ | |/ /
| * | am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-181-3/+3
| |\ \
| | * | Fix bad string in EncryptionInterstitialJim Miller2014-10-171-3/+3
* | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-171-2/+2
|\ \ \ \
| * | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-171-2/+2
* | | | | am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
* | | | | Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statis...Fabrice Di Meglio2014-10-171-1/+1
|\ \ \ \ \
| * | | | | Fix bug #18024258 Crash in Settings observed after tap on Usage statisticsFabrice Di Meglio2014-10-171-1/+1
* | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-171-3/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-161-3/+3
* | | | | | am c7ccba68: am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add strings for upcoming change.Jim Miller2014-10-171-3/+30
* | | | | | am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility ser...Svetoslav2014-10-174-5/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3ea423ae: User to confirm credentials if an accessibility service changes ...Svetoslav2014-10-174-5/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | User to confirm credentials if an accessibility service changes encryption.Svetoslav2014-10-164-5/+18
| | * | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-16101-828/+999
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-15101-828/+999
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-1678-282/+419
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1578-282/+419
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Remove excess whitespace from the factory reset screenSami Tolvanen2014-10-161-0/+2
* | | | | | | Merge "Fix bug #18017952 It does not search all possible "USB" results that c...Fabrice Di Meglio2014-10-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix bug #18017952 It does not search all possible "USB" results that can be f...Fabrice Di Meglio2014-10-161-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-163-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-153-3/+3
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-16112-2002/+2159
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-15112-2002/+2159
* | | | | | | | am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-devJim Miller2014-10-152-0/+85
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | resolved conflicts for merge of 46c7f6d6 to lmp-sprout-devJim Miller2014-10-152-0/+85
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Add a checkbox option to 'require password to decrypt'Jim Miller2014-10-142-0/+84
| | | |_|/ | | |/| |
* | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-141-30/+30
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-141-30/+30
* | | | | am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overvie...Jason Monk2014-10-141-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-devJason Monk2014-10-141-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Update screen pinning strings to say Overview" into lmp-devJason Monk2014-10-141-1/+1
| | |\ \ \
| | | * | | Update screen pinning strings to say OverviewJason Monk2014-10-141-1/+1
* | | | | | am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into ...Andres Morales2014-10-141-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-devAndres Morales2014-10-141-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Set layout_width in WiFi+NFC resource" into lmp-devAndres Morales2014-10-141-0/+2
| | |\ \ \ \
| | | * | | | Set layout_width in WiFi+NFC resourceAndres Morales2014-10-141-0/+2