summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Settings: NL translation" into cm-10.1Marco Brohet2013-06-021-0/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Settings: NL translationEddy Witkamp2013-05-311-0/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pie controls: Tweaking UX for pie service ps2: Allow changing auto-brightness responsitivity. ps3: implemented suggestion ps4: trigger Cid Change-Id: I09df611fa342e43f21c2dfdf98feff2325e15d6e
* | | Settings: SK Translations [FIXED]prescott662013-05-311-0/+368
| |/ |/| | | | | Change-Id: I67775fb852c8e3f7b6f73b494b3ef6d39c2f6c41
* | Merge "Notification Light: Fix apps with same name not showing up" into cm-10.1David van Tonder2013-05-301-136/+137
|\ \
| * | Notification Light: Fix apps with same name not showing upJens Doll2013-05-291-136/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications with the same name didn't show up in the notification light add-app-dialog (with Facebook's "Messenager" and Google's "Messenager" being the prominent example here). This happend due to the fact that the list of applications was sorted by names only and inserts with collisions were dropped. This commit refactor notification light settings to use packages instead of application semantics. Further the list of packages is now ordered by human readable name followed by package name, which avoids the collision. Additionally we handle situtations gracefully where a package has more than one launcher activity (Again for example, Google's "Messenger" and "Google+" is in the same package). Bonus: potential race condition in the list adapter was fixed, concurrent semantics were emphasized, unused imports removed. Change-Id: I87ad32f535ca866883df337432d1b0cecc9485a8
* | | Merge "Settings: ES translations" into cm-10.1Marco Brohet2013-05-291-0/+11
|\ \ \
| * | | Settings: ES translationsdjMesias2013-05-281-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | - Pie controls - Auto-brighness Change-Id: Id39711a7ad70ab1ec796a7b445aa1fa5a67eda56
* | | Merge "ProfilesSettings : Allow nfc override (2/2)" into cm-10.1Danny Baumann2013-05-292-3/+13
|\ \ \ | |/ / |/| |
| * | ProfilesSettings : Allow nfc override (2/2)Danesh Mondegarian2013-05-202-3/+13
| | | | | | | | | | | | | | | | | | Allow user to override nfc state via profiles Change-Id: I2a401f17ce42b1711588242e0604997e1f5d8399
* | | Merge "Pie controls: Tweaking UX for pie service (2/2)" into cm-10.1David van Tonder2013-05-284-0/+57
|\ \ \
| * | | Pie controls: Tweaking UX for pie service (2/2)Jens Doll2013-05-244-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the Settings application part of the user settable activation sensitivity patch for pie controls. For the complete message look at the commit in frameworks/base. Patch Set #3: * Enabled "Very High" * Changed title from "Sensitivity" to "Responsiveness" * Display summary Patch Set #4: * "Very High" -> "Very high" Change-Id: I99fbbc94c75b64121fd04ff5deb8f5a10a04a63b
* | | | Merge "Allow changing auto-brightness responsitivity." into cm-10.1David van Tonder2013-05-284-0/+87
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow changing auto-brightness responsitivity.Danny Baumann2013-05-264-0/+87
| |/ / | | | | | | | | | Change-Id: Icf62db26735f9ab7ad63e750a1824eb7823c3d70
* | | Merge "Clean up CMStats code." into cm-10.1Danny Baumann2013-05-275-185/+191
|\ \ \
| * | | Clean up CMStats code.Danny Baumann2013-05-235-185/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides the cleanup, make sure to wait a bit between retries if upload fails for whatever reason. JIRA:CYAN-1187 Change-Id: Ifca8364721007aadef31b328d22d764ef7cb3b0a
* | | | Settings: PT-BR update translationsGustavo2013-05-261-1/+2
| |/ / |/| | | | | | | | Change-Id: Idab0ff436b12a9c03b42df092a76628dddad5202
* | | Settings: TR translationsokrt2013-05-242-0/+746
| | | | | | | | | | | | Change-Id: Ibeae57d6f8d4435dcf7044505e28d20116975fca
* | | Merge "Navbar : Lock current orientation in edit mode" into cm-10.1David van Tonder2013-05-222-1/+36
|\ \ \ | |/ / |/| |
| * | Navbar : Lock current orientation in edit modeDanesh Mondegarian2013-05-202-1/+36
| |/ | | | | | | | | | | | | Freeze current orientation during edit mode. Jira : https://jira.cyanogenmod.org/browse/CYAN-1117 Change-Id: I61a852855b70011291a242f3068f67336ba61131
* | Merge "Settings: ES translations" into cm-10.1Marco Brohet2013-05-191-27/+28
|\ \ | |/ |/|
| * Settings: ES translationsdjMesias2013-05-191-27/+28
| | | | | | | | | | | | | | | | - Add missing AOSP string - From 3rd to 2nd person - Fix typos Change-Id: I2a094f3d222b787a33993d9cba50aee77c65b694
* | Merge "Update German translation." into cm-10.1Danny Baumann2013-05-181-4/+5
|\ \
| * | Update German translation.Danny Baumann2013-05-181-4/+5
| |/ | | | | | | Change-Id: I0fcb49b9ae2f2da0b37a22bf9e56baab6b09b174
* | Merge "Fix entering navbar editor in expanded desktop mode." into cm-10.1Danny Baumann2013-05-181-51/+37
|\ \ | |/ |/|
| * Fix entering navbar editor in expanded desktop mode.Danny Baumann2013-05-171-51/+37
| | | | | | | | | | | | | | Uses the new system UI visibility flag to show the navbar in expanded desktop mode. Change-Id: Ia515b3c5a73d0741c3aad5421c9ac46d9876c177
* | Merge "Settings: DA translation" into cm-10.1Marco Brohet2013-05-161-1/+14
|\ \ | |/ |/|
| * Settings: DA translationJacob Overgaard Madsen2013-05-141-1/+14
| | | | | | | | | | | | Staging branch and new stirngs Change-Id: If22a5db24a26c08619f005ae8b6e4d94499b167b
* | Merge "Settings: NL translation" into cm-10.1Marco Brohet2013-05-141-3/+2
|\ \ | |/ |/|
| * Settings: NL translationEddy Witkamp2013-05-141-3/+2
| | | | | | | | | | | | | | | | and recources fix ps2: CID Change-Id: I1c53fa14d953a16b1dae9ae45537d1a899de6d58
* | Update stats URLs to use cyanogenmod.orgChris Soyars2013-05-132-3/+3
| | | | | | | | | | To keep things consistent, stats should be reported through stats.cyanogenmod.org, not stats.cyanogenmod.com.
* | Merge "Settings: CS translation" into cm-10.1Marco Brohet2013-05-132-88/+386
|\ \
| * | Settings: CS translationOndrej Zima2013-05-122-88/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | - new CM layout - added missing strings and removed not used strings - removed empty useless lines - rebase Change-Id: I4ebd250b7eb6723126bdc478962d07bcadf01820
* | | Merge "Settings: Update Polish translation" into cm-10.1Marco Brohet2013-05-131-0/+2
|\ \ \
| * | | Settings: Update Polish translationTomasz Popielarczyk2013-05-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Merging Change-Id: I3c4d471995fed5634b81e1688dcbdce7406c4717
* | | | QuickSettings : Fix layoutDanesh Mondegarian2013-05-123-81/+118
| |/ / |/| | | | | | | | | | | | | | | | | | | | Make layout more inline with framework. Scale appropriately on larger devices. Adjust columns according to orientation/device type Change-Id: I20872a42344936b0643a7eff0007c50aaaa5fdd6
* | | Merge "Settings: ES translations" into cm-10.1Marco Brohet2013-05-111-0/+2
|\ \ \
| * | | Settings: ES translationsdjMesias2013-05-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - media volume - contact icon Change-Id: I7df455e2285356b437382bad1a31d26b35fc2e09
* | | | Merge "Settings: Add translatables" into cm-10.1Marco Brohet2013-05-1120-158/+29
|\ \ \ \
| * | | | Settings: Add translatablesdjMesias2013-05-1020-158/+29
| | |_|/ | |/| | | | | | | | | | Change-Id: I14826fa91823973932aa6fa970a780d39a78df04
* | | | Merge "Settings : FR translation" into cm-10.1Marco Brohet2013-05-111-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Settings : FR translationDelPETER2013-05-101-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add cm-10.1-staging translation and new translation Patch set 2 : correction Patch set 3 : correction Change-Id: Ice5ccfcc8fafc8ab500d63329e42555e9dee81a9
* | | Merge "Settings: Update Japanese translation." into cm-10.1Marco Brohet2013-05-111-3/+63
|\ \ \
| * | | Settings: Update Japanese translation.Takuo Kitame2013-05-111-3/+63
| |/ / | | | | | | | | | Change-Id: I08f3b97598a6e2521e8b6bf0b90fc5ba79d12d9c
* | | Merge "Settings: NB translation" into cm-10.1Marco Brohet2013-05-111-0/+1
|\ \ \
| * | | Settings: NB translationOdin Ugedal2013-05-111-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | PS2: Trying to make Cid happy! Commit for staging: http://review.cyanogenmod.org/#/c/37276/ Change-Id: I05622d7b0d7094147085d8523a353ab1dea05ae3
* | | Merge "Settings: HU update translation" into cm-10.1Marco Brohet2013-05-111-0/+2
|\ \ \ | |/ / |/| |
| * | Settings: HU update translationTamás Tóth2013-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | PS2: Trigger Cid PS3: Trigger Cid Change-Id: I52040a7887a01f17cc84b63323daa73502ce56b7
* | | Merge "Settings: RU translation" into cm-10.1Marco Brohet2013-05-101-0/+2
|\ \ \
| * | | Settings: RU translationpvolkov2013-05-091-0/+2
| | |/ | |/| | | | | | | | | | | | | Patch Set 2: Update translation Patch Set 3: Update translation
* | | Merge "Settings: Simplified Chinese Translations" into cm-10.1Marco Brohet2013-05-102-3/+3
|\ \ \