summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Settings: Missing Danish stringsJacob Overgaard Madsen2013-02-162-2/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | Patchset 4: More new strings - just a minor wording change, based on a change in the source Change-Id: I399a662b5e8a972008bee6573ebe546f8938c090
* | | | es_ES: Updated spanish translationsdjMesias2013-02-161-6/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | - ellipsis to Unicode - backlight curve adjustement - minor changes Change-Id: I7902bfe6b4454eb9463ef754fc513e5dde848ff3
* | | Merge "Settings: PT-BR translations" into cm-10.1Marco Brohet2013-02-161-2/+2
|\ \ \
| * | | Settings: PT-BR translationsMarco Brohet2013-02-151-2/+2
| | | | | | | | | | | | | | | | Change-Id: Icc3dbbbf00b899de57b39cfcc5c9414f72cb2522
* | | | Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1Marco Brohet2013-02-161-0/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Update Russian Translation-Settings-CM10.1pvolkov2013-02-151-0/+21
| |/ / | | | | | | | | | | | | | | | Update Russian Translation-Settings-CM10.1 Change-Id: Ica17db6d5f318e21cbaedb703e019ad0fe877325
* | | Settings: Remove redundant linesMarco Brohet2013-02-152-8/+0
|/ / | | | | | | Change-Id: I8f049386a6860bb3990fb56013beb9c9022b8bd7
* | Some post-merge cleanup for automatic brightness adjustmentDanny Baumann2013-02-151-2/+0
|/ | | | | | | | - Remove some unused strings - Use (device-dependant) minimum brightness level (as calculated by DisplayPowerController) as '0%' instead of the actual value 0. Change-Id: I79123d2421c9ab35fa0f1808d82d785463e8fbaa
* Merge branch 'mr1.1-staging' of ↵Steve Kondik2013-02-1479-2147/+1523
|\ | | | | | | | | | | git://github.com/CyanogenMod/android_packages_apps_Settings into mr1.1-staging Change-Id: I17e7cea5e432d0025c64465a7c01c42bb24e7133
| * Merge commit 'android-4.2.2_r1' into mr1.1-stagingRicardo Cerqueira2013-02-1579-2147/+1523
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: AndroidManifest.xml res/values-de/strings.xml res/values-el/strings.xml res/values-es/strings.xml res/values-fi/strings.xml res/values-hu/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-zh-rCN/strings.xml res/values/strings.xml src/com/android/settings/ChooseLockGeneric.java src/com/android/settings/ChooseLockPatternTutorial.java src/com/android/settings/DeviceInfoSettings.java src/com/android/settings/Settings.java Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
| | * Import translations. DO NOT MERGEBaligh Uddin2012-12-123-13/+13
| | | | | | | | | | | | | | | Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2012-12-107-9/+9
| | | | | | | | | | | | | | | Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2012-12-0749-164/+191
| | | | | | | | | | | | | | | Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1 Auto-generated-cl: translation import
| | * Add latest area info broadcast to Settings status screen.Jake Hamby2012-12-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the SIM has a Brazilian country code, add an item to the status screen to show the most recently received area info cell broadcast, requested from CellBroadcastReceiver, which also broadcasts any updates to the area info. To read the area info broadcast or request it from CellBroadcastReceiver requires READ_PHONE_STATE permission. Bug: 7445881 Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
| | * Merge "Import translations. DO NOT MERGE" into jb-mr1.1-devBaligh Uddin2012-12-0449-80/+107
| | |\
| | | * Import translations. DO NOT MERGEBaligh Uddin2012-12-0449-80/+107
| | | | | | | | | | | | | | | | | | | | Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925 Auto-generated-cl: translation import
| | * | Merge "Revised language for notification ringtone picker." into jb-mr1.1-devDaniel Sandler2012-12-041-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Revised language for notification ringtone picker.Daniel Sandler2012-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7659273 Change-Id: Id2702881d3789447ee18530749897448306d4148
| | * | Merge "Import translations. DO NOT MERGE" into jb-mr1.1-devBaligh Uddin2012-12-0449-944/+743
| | |\ \
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-12-0349-944/+743
| | | |/ | | | | | | | | | | | | | | | | Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef Auto-generated-cl: translation import
| | * | Better layouts for security screen setups as part of b/7459863Danielle Millett2012-11-308-145/+107
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The major change is that choose pattern and confirm pattern layouts no longer uses a split screen layout on tablets. The new layout closely mimics the layout for portrait. Other minor changes include: -Made the header font size for confirm pattern and choose pattern medium (this matches with face unlock changes). -Made the buttons on choose pattern for landscape phone side-by-side rather than above each other (to be consistent with face unlock). -Removed the black background from phone landscape confirm pattern since it's inconsistent with all the other layouts. Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
| | * Merge "Removing tutorial for choosing a pattern as part of b/7459863" into ↵Danielle Millett2012-11-305-351/+0
| | |\ | | | | | | | | | | | | jb-mr1.1-dev
| | | * Removing tutorial for choosing a pattern as part of b/7459863Danielle Millett2012-11-215-351/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the tutorial that is shown the first time a user sets up a pattern as their lock type. Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
| | * | Merge "Push scrollbars to screen edges." into jb-mr1.1-devJeff Sharkey2012-11-3010-146/+152
| | |\ \
| | | * | Push scrollbars to screen edges.Jeff Sharkey2012-11-3010-146/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Push scrollbar to screen edges on custom ListView and ScrollViews to match Preferences framework behavior. Bug: 7633165 Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
| | * | | Merge "Fix text alignment and simplify layouts." into jb-mr1.1-devJeff Sharkey2012-11-304-127/+103
| | |\ \ \ | | | |/ /
| | | * | Fix text alignment and simplify layouts.Jeff Sharkey2012-11-304-127/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Apps items to correctly base align text, and to align correctly in RTL mode. Use GridLayout to reduce layout complexity. Bug: 7633350, 7132595 Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea
| | * | | Merge "Use plurals for the developer steps countdown" into jb-mr1.1-devEvan Charlton2012-11-301-1/+4
| | |\ \ \
| | | * | | Use plurals for the developer steps countdownEvan Charlton2012-11-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When counting down how many steps are left before the user becomes a developer, use plurals so that "steps" becomes "step" correctly. Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
| | * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1.1-devBaligh Uddin2012-11-291-1/+1
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c Auto-generated-cl: translation import
| | * | | | | Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into ↵Jeff Sharkey2012-11-291-10/+9
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | | | Use uniform font size for APNs and timezones. DO NOT MERGE.Jeff Sharkey2012-11-291-10/+9
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get rid of some orange highlight! Bug: 7632945 Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
| | * | | | | Add string resource removed by previous commit.Jake Hamby2012-11-291-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "bluetooth_permission_request" string resource was removed in a previous commit, but is still referenced by a manifest element. Add the original string resource to strings.xml. Bug: 7641406 Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
| | * | | | Merge "Fix Bluetooth enable dialog to match Android style guide." into ↵Jake Hamby2012-11-292-51/+15
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | jb-mr1.1-dev
| | | * | | Fix Bluetooth enable dialog to match Android style guide.Jake Hamby2012-11-202-51/+15
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app requests to enable Bluetooth and/or Bluetooth discovery, we show a dialog for user confirmation. Remove the dialog title, update the message text and button labels to be more descriptive, and use the standard dialog layout instead of a custom layout. Also fixes the button layout on the Bluetooth permission test app so that the "Discoverable" button doesn't wrap to two lines. Bug: 6001468 Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
| | * | | Merge "Update a few dream setting strings to ease translation." into ↵John Spurlock2012-11-281-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | Update a few dream setting strings to ease translation.John Spurlock2012-11-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that sleep = asleep and charging as we do in the ui. Bug: 7564443 Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-274-10/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f Auto-generated-cl: translation import
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-11-2249-84/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b Auto-generated-cl: translation import
| | * | | am e71a8772: Import translations. DO NOT MERGEBaligh Uddin2012-11-226-15/+15
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-11-216-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe Auto-generated-cl: translation import
| | * | | am 7ed1879f: Import translations. DO NOT MERGEBaligh Uddin2012-11-163-39/+39
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-11-163-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06 Auto-generated-cl: translation import
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-11-143-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76 Auto-generated-cl: translation import
| | * | | Merge "Align "Make passwords visible" setting." into jb-mr1.1-devJeff Sharkey2012-11-152-3/+0
| | |\ \ \
| | | * | | Align "Make passwords visible" setting.Jeff Sharkey2012-11-142-3/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 7545894 Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-11-143-22/+22
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I42acdae7131e469b7f01371d33abf9fa7c92cc1d Auto-generated-cl: translation import
| | * | Import translations. DO NOT MERGEBaligh Uddin2012-11-095-15/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3 Auto-generated-cl: translation import
* | | | Settings: Fix build warningsjackmu952013-02-143-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes build warnings caused by http://review.cyanogenmod.org/#/c/31894/ and http://review.cyanogenmod.org/#/c/31897/ Change-Id: If93f5a3111691b8fb928db426ce81936ce116dc4
generated by cgit v1.1 at 2025-08-05 23:50:55 +0000