summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Settings: PT-BR update translations" into cm-10.1Danny Baumann2013-06-271-0/+8
|\ \
| * | Settings: PT-BR update translationsGustavo2013-06-261-0/+8
| |/ | | | | | | Change-Id: I5a6a67e1410ed31b1f50da9e801113f132364454
* | Settings: RU translationspvolkov2013-06-271-0/+1
|/ | | | Change-Id: If6b8c82e5749a06fadd891c1aab8ec56d9fd8a35
* Merge "Add 2G/3G option to profile connections (2/2)" into cm-10.1David van Tonder2013-06-262-0/+13
|\
| * Add 2G/3G option to profile connections (2/2)Jo De Boeck2013-06-262-0/+13
| | | | | | | | | | | | Only show option when network type is GSM not CDMA Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b
* | Merge "QuickSettings: Camera tile" into cm-10.1David van Tonder2013-06-261-0/+1
|\ \ | |/ |/|
| * QuickSettings: Camera tileNebojsa Cvetkovic2013-06-261-0/+1
| | | | | | | | Change-Id: I8de198c6144e1b0194ebeaffffec084035492635
* | Merge "Settings: NL translation" into cm-10.1Marco Brohet2013-06-262-8/+21
|\ \
| * | Settings: NL translationEddy Witkamp2013-06-232-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to enable/disable Electron Beam ps2: add an AlertDialog before to delete APN to avoid fails ps3: fix \' misstake ps4: Permit home button wake to be configurable ps5/6: Add triggers to change profile based on AP ps7: Rename 'Power sounds' to 'Charging sounds' and add summary ps8: Shorten clumsy and repetitive gesture strings Remove triggers added in ps5/6 so we can merge this faster ps9: Add bluetooth triggers to profiles Re-add triggers removed in ps8 Change-Id: Ic771d10c42b2650612890419122ca177878f39e7
* | | Settings: ES translationsdjMesias2013-06-261-0/+5
| | | | | | | | | | | | | | | | | | - PrivacyGuard Change-Id: Id531c7549a934023c5c5f47f6052aaaf3a7a12c7
* | | Merge "Settings: PT-BR update translations" into cm-10.1Danny Baumann2013-06-261-0/+5
|\ \ \
| * | | Settings: PT-BR update translationsGustavo2013-06-241-0/+5
| | | | | | | | | | | | | | | | Change-Id: I8558988e100b56bf612bc80d7572c7bdb1c94ffd
* | | | Merge "Settings: RU translation" into cm-10.1Danny Baumann2013-06-262-10/+20
|\ \ \ \
| * | | | Settings: RU translationpvolkov2013-06-252-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36c20600032968c1bdd08fc63d1e7f22b82b8d42 Patch Set 2: Update translation Change-Id: I8c55e248d54b9d18f956b09366e1473e4a177201 Patch Set 3: Update translation Change-Id: I064bcf0e8fbc785559ad3ca7e70dc1a805bdc04f Patch Set 4: Update translation Change-Id: Ib2d79a391c58b7c2d6557e0d6789a32d87172773 Patch Set 6: Update translation Change-Id: I8e2fdc5e50cd8d5b9c7e71cf9fc25ba7b8b714df
* | | | | Settings: HU translation updateTamas Toth2013-06-251-2/+10
| |/ / / |/| | | | | | | | | | | Change-Id: I2548daca04065877b705ea0c59541047851ef734
* | | | settings: Privacy Guard supportSteve Kondik2013-06-244-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add toggle to InstalledAppDetails to enable/disable privacy guard flag on a per-application basis. * Add toggle to enable privacy guard by default for applications. Change-Id: If03aa5319c520b6c4a78887f0f46ef1443ddaa83
* | | | Merge "Settings: ES translations" into cm-10.1Marco Brohet2013-06-241-2/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Settings: ES translationsdjMesias2013-06-231-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | - Wi-Fi triggers - Charging sounds summary - Bluetooth triggers - REBASED Change-Id: Ib3c992c83e13958ddfe076042de7bc83640d3a71
* | | Settings: PT-BR update translationsGustavo2013-06-231-7/+10
|/ / | | | | | | Change-Id: I6a66d71ae29e07e4cbace7e7b439d01f12392219
* | Merge "[1/2] Add bluetooth triggers to profiles" into cm-10.1David van Tonder2013-06-232-2/+11
|\ \
| * | [1/2] Add bluetooth triggers to profilesJo De Boeck2013-06-222-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed WifiTriggerFragment to TriggersFragment as it is used by multiple trigger types Made AbstractTriggerPreference used by multiple trigger types Renamed some strings to make more sense Make sure the configured triggers are shown even if type is disabled. E.g. when Wi-Fi is disable listing AccessPoints does not work for triggers, already configured triggers will still be shown. Change-Id: Ife78269586aa2ab7fa94d3462582e259f9228ab2
* | | Settings: AF translationDvTonder2013-06-221-3/+3
| | | | | | | | | | | | Change-Id: I7ffce709e4f31e4db01c68ba80e121fbd827c20e
* | | Merge "Settings: Fix Slovak aapt warnings" into cm-10.1David van Tonder2013-06-221-11/+0
|\ \ \ | |/ / |/| |
| * | Settings: Fix Slovak aapt warningsJorge Ruesga2013-06-221-11/+0
| | | | | | | | | | | | | | | Change-Id: I3c41b782ce4f8bc1ecc4895709b9251b9857da2d Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | | Settings: Rename 'Power sounds' to 'Charging sounds' and add summaryDvTonder2013-06-222-6/+8
|/ / | | | | | | Change-Id: I1cb872917e2d03f0a1c77c25c27f2a0496f9bc05
* | Shorten clumsy and repetitive gesture stringsVeeti Paananen2013-06-201-5/+5
| | | | | | | | Change-Id: I77e4d980bcb2f2ed64169450e2de225d9ab3c079
* | Merge "Settings: Add missing Af translations" into cm-10.1David van Tonder2013-06-191-0/+23
|\ \
| * | Settings: Add missing Af translationsisimobile2013-06-141-0/+23
| | | | | | | | | | | | Change-Id: I59ba17135af996b3627a2ecabc4bf4873fe0b21a
* | | Merge "Settings: IT translations" into cm-10.1Danny Baumann2013-06-181-11/+20
|\ \ \
| * | | Settings: IT translationsFrancesco2013-06-171-11/+20
| | | | | | | | | | | | | | | | Change-Id: Ic3024ba0974b2ef8b3ebaef47ccfe306880716b6
* | | | Settings: HU translation updateTamas Toth2013-06-181-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PS2: Triggering Cid PS3: Update PS4: Typo PS5: Update PS6: Typo PS7: Update Change-Id: Ie4f8529d22aceb7923ed15fc393b504a44600c56
* | | | Merge "Show application's package name in the "App info" screen." into cm-10.1David van Tonder2013-06-171-2/+15
|\ \ \ \
| * | | | Show application's package name in the "App info" screen.Chirayu Desai2013-06-131-2/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I7dac8ffa0b10abb5ff235750e90a96d801b2f919
* | | | | Merge "Settings: PT-BR update translations" into cm-10.1Danny Baumann2013-06-171-0/+6
|\ \ \ \ \
| * | | | | Settings: PT-BR update translationsGustavo2013-06-151-0/+6
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ib4945c097e8e474ef20b2019f54ac7d91a8f81b4
* | | | | Settings: RU translationpvolkov2013-06-151-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f96ff2e51a7106b0e11ad688893872fb367f3a2 Patch Set 2: Update translation Change-Id: I8d6c15bb0daf112d00802c125ed9d65493ec2875
* | | | [2/2] Add triggers to change profile based on APJo De Boeck2013-06-145-0/+13
| |/ / |/| | | | | | | | | | | | | | Add UI for configuring triggers to active profiles. Change-Id: I4903ef64d3eced687136a7dcf4d2048ce4b7ca63
* | | Merge "Settings: RU translation" into cm-10.1Danny Baumann2013-06-141-1/+17
|\ \ \
| * | | Settings: RU translationpvolkov2013-06-061-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Patch Set 2: Update translation Patch Set 3: Update translation
* | | | Merge "Settings: Simplified Chinese Translations" into cm-10.1Danny Baumann2013-06-142-6/+22
|\ \ \ \
| * | | | Settings: Simplified Chinese TranslationsAndrew Jiang2013-06-062-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch Set 2: Rebased, added crt-off option translations. Patch Set 3: Modifications, also restored some AOSP strings. Change-Id: I1c5910abcc323db0c6736d6fac63086619d870ab
* | | | | Merge "Settings: EL translations" into cm-10.1Danny Baumann2013-06-141-0/+17
|\ \ \ \ \
| * | | | | Settings: EL translationsMichael Bestas2013-06-061-0/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I67d1aae92a76b104b5385bf1fa6ad309687627cf
* | | | | Merge "Settings: ES translations" into cm-10.1Danny Baumann2013-06-141-1/+4
|\ \ \ \ \
| * | | | | Settings: ES translationsdjMesias2013-06-141-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Confirm delete APN - Home button wake device Change-Id: Ic6529ab322dc483915763791f96653b36da80b9e
* | | | | Merge "Settings: PT-BR update translations" into cm-10.1Danny Baumann2013-06-131-2/+7
|\ \ \ \ \
| * | | | | Settings: PT-BR update translationsGustavo2013-06-131-2/+7
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I6d0b5c5621feb773c5ada5c1543424938617930d
* | | | | Merge "Settings: FR translation" into cm-10.1Danny Baumann2013-06-131-0/+5
|\ \ \ \ \
| * | | | | Settings: FR translationDelPETER2013-06-131-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add new translation -Patch set 2: rebase and add new translation -Patch set 3: rebase and add new translation Change-Id: I8c0e77c5837a87d92ee950c72e45268bcd6cdaef
* | | | | Settings: CS translationOndrej Zima2013-06-141-27/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added new for PIE control - added new for brightness responsitivity - removed quotes - fixed some mistakes - rebased and added Hangouts - rebased and added screen off animation strings - rebased and added APN remove message - rebased and added Home button awaking Change-Id: I022b8f76ae5f71eead65687a1e1e26e73f4f54cd