summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Settings: FR Translation" into cm-10.1Marco Brohet2013-08-091-0/+8
|\
| * Settings: FR TranslationDelphin PETER2013-08-081-0/+8
| | | | | | | | | | | | -Patch set 1: add new tanslation Change-Id: I2e93d1fc2026d3f6bb827396b9008bbaf6630368
* | Settings: Update German translaionjackmu952013-08-091-0/+9
|/ | | | | | | - add missing strings - translate untranslated strings Change-Id: I4064d454e78beef009061c6ceff6e454497e09fa
* Merge "Settings: DA translation" into cm-10.1Marco Brohet2013-08-081-3/+95
|\
| * Settings: DA translationJacob Overgaard Madsen2013-08-061-3/+95
| | | | | | | | | | | | A few other revisions from review. Cid, please play nicely. Change-Id: I907d816982ab838455d492ba14501be4b92d83f0
* | Also remove preferences if app is installed, but disabled.Danny Baumann2013-08-071-3/+15
| | | | | | | | | | Change-Id: I7f23e7a05c336bd16cda3426c7b31922cb92e1b2 JIRA:CYAN-1861
* | Settings : Simplified Chinese translationYuanQY2013-08-052-7/+56
|/ | | | Change-Id: Idd9daaaf926c17119d39fa9a9cfbcc1e8ecfcff7
* Merge "Settings: CS translation" into cm-10.1Danny Baumann2013-08-051-0/+8
|\
| * Settings: CS translationOndrej Zima2013-07-311-0/+8
| | | | | | | | | | | | - added notification tray closing Change-Id: I6e3ea05f8017bcd22ac6e46639d59d5c894f921f
* | Merge "Settings: RU translation" into cm-10.1Marco Brohet2013-08-031-2/+10
|\ \
| * | Settings: RU translationVladimir Belkov2013-08-011-2/+10
| | | | | | | | | | | | Change-Id: I619648668eb2698e00ed47d894f93a5804e2f28f
* | | Merge "Settings: IT translations" into cm-10.1Marco Brohet2013-08-031-0/+8
|\ \ \
| * | | Settings: IT translationsFrancesco2013-07-311-0/+8
| | | | | | | | | | | | | | | | Change-Id: Ide2f67fdfcbe805f11e77ef2f9aea075ef640386
* | | | Hide the camera widget option if no camera on deviceVeeti Paananen2013-08-031-0/+6
| |/ / |/| | | | | | | | Change-Id: I034c246651fc9ae698bc32fd4af16cf14adb5314
* | | Merge "Settings: HU translation" into cm-10.1Marco Brohet2013-08-011-0/+8
|\ \ \
| * | | Settings: HU translationTamas Toth2013-07-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PS2: Typo PS3: Typo Change-Id: I042f3ccfe4fd1992b94719239c57f1a21f5dd196
* | | | Settings: ES translationsdjMesias2013-07-311-0/+8
| |/ / |/| | | | | | | | | | | | | | - Notification drawer behavior Change-Id: I04c99b172e83831ee0c0ed1b1d51b8613c0229c9
* | | Merge "Settings: NL translation" into cm-10.1Marco Brohet2013-07-311-1/+9
|\ \ \
| * | | Settings: NL translationEddy Witkamp2013-07-301-1/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | Make notification-shade-collapse-after-dismiss behaviour configurable. ps2: rebase Change-Id: I8e9542afa6097efe171c7e71e4c91387e85178c2
* | | Merge "Minor typo fix Wi-FI -> Wi-Fi" into cm-10.1Marco Brohet2013-07-312-5/+5
|\ \ \
| * | | Minor typo fix Wi-FI -> Wi-FiJose Villegas2013-07-292-5/+5
| | | | | | | | | | | | | | | | Change-Id: I457a5cab6de706ab6fd05bf1b9c6c2531cdab4d1
* | | | Settings: PT-BR translationsGustavo2013-07-301-1/+9
| | | | | | | | | | | | | | | | Change-Id: I67f3655927bac23bd40a6f7b508927ac850b0964
* | | | Merge "Sort disabled apps to the end of the list in privacy guard manager." ↵David van Tonder2013-07-301-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | into cm-10.1
| * | | | Sort disabled apps to the end of the list in privacy guard manager.Danny Baumann2013-07-301-1/+6
| | |/ / | |/| | | | | | | | | | | | | | JIRA: CYAN-1703 Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
* | | | Merge "Fix app selection when adding apps to app groups." into cm-10.1David van Tonder2013-07-301-10/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Fix app selection when adding apps to app groups.Danny Baumann2013-07-301-10/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | - Don't drop separate apps with the same title - Sort case-insensitive - Sort disabled apps to the end of the list Change-Id: Iffadca4896468aaee5fcfd60f8776c2bb1a8ce7f
* | | Fix derp.Danny Baumann2013-07-301-2/+0
|/ / | | | | | | Change-Id: I473684a9ec4763c33709d5f59a5403eff63ce97e
* | Merge "Make notification-shade-collapse-after-dismiss behaviour ↵Danny Baumann2013-07-3030-121/+138
|\ \ | |/ |/| | | configurable." into cm-10.1
| * Make notification-shade-collapse-after-dismiss behaviour configurable.Danny Baumann2013-07-2730-121/+138
| | | | | | | | Change-Id: Icbf706a582279b86d901fb727b58663713606521
* | Merge "Settings: CS translation" into cm-10.1Marco Brohet2013-07-281-1/+1
|\ \
| * | Settings: CS translationOndrej Zima2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - fixed aapt warning - added lock screen rotation - CID rebuild Change-Id: Ie6a51e0829d32e355542f0adaf4cc9b7f75aced5
* | | Merge "Settings: CS AOSP translation" into cm-10.1Marco Brohet2013-07-281-1/+1
|\ \ \
| * | | Settings: CS AOSP translationOndrej Zima2013-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added Privacy guard - slightly tuned - fixed - just another tuning Change-Id: I22318867d04994e44e215e503228b56d9d8f06f9
* | | | Merge "Settings: update Japanese translation." into cm-10.1Marco Brohet2013-07-281-0/+53
|\ \ \ \
| * | | | Settings: update Japanese translation.Takuo Kitame2013-07-211-0/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | - Add missing translation entries. Change-Id: Ie75276d7994a486e784dc67eb92f02506bf904c9
* | | | Merge "Settings : FR translation" into cm-10.1Marco Brohet2013-07-281-0/+1
|\ \ \ \
| * | | | Settings : FR translationDelphin PETER2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add new translation Change-Id: If8c045e3b6e5e03f3621b753a9b9da2d043d1655
* | | | | Merge "Settings: EL translations" into cm-10.1Marco Brohet2013-07-281-2/+45
|\ \ \ \ \
| * | | | | Settings: EL translationsMichael Bestas2013-07-231-2/+45
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ibc616eceede964fa4556f6f585d78131713b8f23
* | | | | CellBroadcast: Disable App links on wifi-only devicesJorge Ruesga2013-07-261-10/+14
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | PatchSet 2: Remove unnecessary check Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | | | Merge "Settings: ES translations" into cm-10.1Jorge Ruesga2013-07-241-5/+6
|\ \ \ \
| * | | | Settings: ES translationsdjMesias2013-07-231-5/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Rotate lock screen - Minor changes Change-Id: Ia493de6b30315e695072d92a6ddef9c4f250e4ba
* | | | Hide the AM/PM preference completely if using a 24-hour clockVeeti Paananen2013-07-232-16/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition, this commit also fixes a bug where the switch would not be disabled on a fresh 24-hour clock install, as the preference value would be null. This is avoided by using a higher-level method from DateFormat to check the clock mode. Patch Set 2: improve code styling Patch Set 3: remove pointless application context retrieval Change-Id: I80de938df61803649688723843439905e9909b07
* | | Merge "Settings: NL translations" into cm-10.1Marco Brohet2013-07-221-2/+5
|\ \ \ | |_|/ |/| |
| * | Settings: NL translationsMarco Brohet2013-07-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ps1: Storage Settings: Allow user to trigger a volume rescan ps2: Add lockscreen rotation as an optional rotation setting ps3: fix typo: selecteer -> selecteert ps4: fix typo: netwek -> netwerk Change-Id: Iefd0acc943f3c93c58fb567601949b741ac57ef6
* | | Merge "Settings: Update Polish translation" into cm-10.1Marco Brohet2013-07-202-6/+63
|\ \ \
| * | | Settings: Update Polish translationtompopielarczyk2013-07-142-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PS2: Added missing strings and latest updates PS5: Minor fix and latest updates Change-Id: Ie339402f41a31a7d3823bd8f86d4c0ded6b7d250
* | | | Merge "Add a quick SELinux mode toggle" into cm-10.1Ricardo Cerqueira2013-07-181-0/+17
|\ \ \ \
| * | | | Add a quick SELinux mode toggleRicardo Cerqueira2013-07-191-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no way to make it persistent, by design. This is purposefully undocumented and meant to test policies at this stage. Change-Id: Ic79ed773b199b68fee15f94acd2107a5ad20dc25
* | | | | Fix IllegalArgumentException in Privacy Guard ManagerScott Brady2013-07-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On tablets such as manta a this occurs. To reproduce go into PGM, press the back button one time, then go back into PGM. http://pastebin.com/N7XAybUB Remove privacy guard fragment in onDestroyView Change-Id: I61cebe273fa6fd514f18c86894acd176701148f6 Check if fragment transaction is empty before attempting to remove it Change-Id: I08591c89559d33fee30ac2934fdbcc30637147da PrivacyGuard fragment fix - change from empty check to isDestroyed check Change-Id: I52fe44b7446cd16793df6ac9cdbe31e2ddd70210 Signed-off-by: Paul Beeler <sparksco@gmail.com> PrivacyGuardManager: Reduce calls to getFragmentManager Change-Id: I74f07a58b09cf0e9114d0c1c56e9a97d55ab0900