summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Collapse)AuthorAgeFilesLines
* am ca61c255: am a4966840: am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-031-0/+2
|\
| * am a4966840: am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-031-0/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken * commit 'a496684019497395b71c6d460501197a74e21e0e': Add phase2 authentication settings
| | * am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-031-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp * commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1': Add phase2 authentication settings
| | | * Add phase2 authentication settingsIrfan Sheriff2010-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 2734813 Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
* | | | Added an Input Method selector in Language settingsAmith Yamasani2010-06-011-0/+2
| | | | | | | | | | | | | | | | Bug: 2132207 - Settings UI has no way to change IME
* | | | Change I546ee2fb: Fix 2677197: Adding minimum complex character support.Konstantin Lopyrev2010-05-271-0/+30
| | | | | | | | | | | | | | | | Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
* | | | am 3f253cf2: am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve ↵Dianne Hackborn2010-05-181-3/+0
|\ \ \ \ | |/ / / | | | | | | | | STOPSHIP
| * | | am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP
| | * | am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp * commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624': Fix issue #2694643: Remove/Resolve STOPSHIP
| | | * Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | *poof* Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
* | | | Making the choose password strings clearerKonstantin Lopyrev2010-05-131-5/+5
| | | | | | | | | | | | | | | | Change-Id: Ib693145542972863677fa0a383278e95abfb239d
* | | | Fix 2673731: Added password historyKonstantin Lopyrev2010-05-121-0/+6
| | | | | | | | | | | | | | | | Change-Id: I6198833e099ec1f33309dc26b28e0fd4a6edb288
* | | | am ddde146f: am 482eadea: am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-101-15/+16
|\ \ \ \ | |/ / /
| * | | am 482eadea: am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-101-15/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken * commit '482eadeae85a1764b86133172d11364df6ce7227': String change - wifi tether = hotspot
| | * | am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-101-15/+16
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp * commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7': String change - wifi tether = hotspot
| | | * String change - wifi tether = hotspotRobert Greenwalt2010-05-081-15/+16
| | | | | | | | | | | | | | | | | | | | bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
* | | | am a9523ed0: am dd379184: am f0746678: Merge "Redesign vibration settings." ↵Daniel Sandler2010-04-212-7/+9
|\ \ \ \ | |/ / / | | | | | | | | into froyo
| * | | am dd379184: am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-212-7/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken * commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7': Redesign vibration settings.
| | * | am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-212-7/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp * commit 'f07466782bb25ce4f2738133d0992f3531af28e5': Redesign vibration settings.
| | | * Redesign vibration settings.Daniel Sandler2010-04-212-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the hood there remain three axes: 1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT} 2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1 3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER) - always | == VIBRATE_SETTING_ON - never | == VIBRATE_SETTING_OFF - only in silent | == VIBRATE_SETTING_ONLY_SILENT We now expose this to the user much more simply by collapsing (2) and (3) above, and discarding states that don't make sense: - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT Now we offer the user four choices: Phone vibrate: * "Never" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF * "Always" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON * "Only in silent mode" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT * "Only when not in silent mode" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON This should make it easier to choose exactly the behavior the user wants as well as avoid nonsensical combinations of settings. Bug: 2598014 Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
* | | | am 94440bd9: am 9e2810bb: am 19340d21: Merge "Labeled categories to help ↵Daniel Sandler2010-04-211-0/+5
|\ \ \ \ | |/ / / | | | | | | | | clarify Sound prefs." into froyo
| * | | am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound ↵Daniel Sandler2010-04-211-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefs." into froyo Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken * commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1': Labeled categories to help clarify Sound prefs.
| | * | am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-211-0/+5
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.
| | | * Labeled categories to help clarify Sound prefs.Daniel Sandler2010-04-211-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 2598014 Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
* | | | am 1795d18f: am 2c3265af: merge from open-source masterThe Android Open Source Project2010-04-211-0/+3
|\ \ \ \ | |/ / /
| * | | am 2c3265af: merge from open-source masterThe Android Open Source Project2010-04-211-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken * commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40': Display current IP address in advanced Wifi settings screen
| | * | merge from open-source masterThe Android Open Source Project2010-04-211-0/+3
| | |\ \ | | | |/ | | |/| | | | | Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
| | | * Display current IP address in advanced Wifi settings screenMike Lockwood2010-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I47c6eece376e712b73add72057462926f7b2349f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | text changes to language pickerFreeman Ng2010-04-161-3/+1
|/ / / | | | | | | | | | | | | | | | bug: 2129684 Change-Id: I0a525c32b1b2712d6d38fa202834931a3deeed2d
* | | am 91523d60: Fix 2579923: Update language to make consistent with related ↵Jim Miller2010-04-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | feature. Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken * commit '91523d601a6569ce9295a5617ca92a24582ff502': Fix 2579923: Update language to make consistent with related feature.
| * | Fix 2579923: Update language to make consistent with related feature.Jim Miller2010-04-121-1/+1
| | | | | | | | | | | | Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
* | | am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more ↵Jim Miller2010-04-121-8/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | discoverable." into froyo Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken * commit '0b326a6fad8caf250b61cc49b962495202562a5c': Fix 2579923: Make changing lock screen method more discoverable.
| * | Fix 2579923: Make changing lock screen method more discoverable.Jim Miller2010-04-111-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the organization of lock screen security settings to make choosing an alternate unlock method more discoverable. Instead of having to disable the old lock method to use a new one, the user now just has one set/change option in lock settings, with a list of method-specific setting below it. In addition, we ask the user to confirm their old credentials before prompting them to choose a new one, which eliminates one source of confusion. Also, ChooseLockGeneric now shows a UI if quality isn't specified. Any unlock method less secure than minimum specified by DevicePolicyManager (if active) is greyed out. Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
* | | am 8c8185b2: Fixing bugs 2577511 and 2581920. Making sure that the language, ↵Charles Chen2010-04-081-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | country, and variant defaults are always set to something to ensure that there won\'t be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken * commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f': Fixing bugs 2577511 and 2581920.
| * | Fixing bugs 2577511 and 2581920.Charles Chen2010-04-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making sure that the language, country, and variant defaults are always set to something to ensure that there won't be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by the list being displayed while its data is being re-initialized. Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
* | | am 38947ddc: Fix the build - doh.Mike LeBeau2010-03-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken * commit '38947ddcfb2411d380d631ebfc29d66b11821879': Fix the build - doh.
| * | Fix the build - doh.Mike LeBeau2010-03-301-1/+1
| | | | | | | | | | | | Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
* | | am e076bef9: Add new string to identify what speech recognizer the settings ↵Mike LeBeau2010-03-301-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | are for. Merge commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2' into kraken * commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2': Add new string to identify what speech recognizer the settings are for.
| * | Add new string to identify what speech recognizer the settings are for.Mike LeBeau2010-03-301-0/+3
| | | | | | | | | | | | | | | | | | http://b/2546173 Change-Id: I7d59a69eba0e4f3c87586c968574d291a200352c
| * | DO NOT MERGEOscar Montemayor2010-03-261-21/+0
|/ / | | | | | | | | | | | | Removing unused features from source tree. Please refer to Bug#2502219. Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
* | Fix 2535700: Strings for additional security policies.Jim Miller2010-03-221-2/+8
| | | | | | | | Change-Id: Icd2f31ae5393ee7b26113d8c3f31ef06b3469939
* | softAp UI changesIrfan Sheriff2010-03-161-3/+2
| | | | | | | | | | | | | | | | | | Remove channel settings Add subtext error handling Remove WEP, keep WPA2 only for now Bug: 2413908 Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
* | Minor edits to strings related to SD card work.Roy West2010-03-111-10/+10
| | | | | | | | Change-Id: I8a700485f538d3179334557a5485fe2205be14a9
* | Add new error dialog when moving apps fails.Suchi Amalapurapu2010-03-101-0/+12
| | | | | | | | Change-Id: I3b1c815ff5f515c2116771e0392cf91fbfaea9f4
* | Clean up the tethering settings screen a bit.Robert Greenwalt2010-03-091-7/+0
| | | | | | | | Change-Id: Iadd1cf9245a5ccd38537050a6b6c9d9390400b20
* | Add Settings strings for power button behavior (accessibility)David Brown2010-03-081-0/+6
| | | | | | | | Bug: 2364220
* | Update Tethering UIRobert Greenwalt2010-03-041-6/+14
| | | | | | | | Finalizing some strings and changing the error handling.
* | Fix previous Settings string checkinMartin Hibdon2010-03-041-1/+1
| | | | | | | | There was a typo in my previous checkin.
* | Add new strings to SettingsMartin Hibdon2010-03-041-0/+8
| | | | | | | | | | | | | | There will be a new setting to enable to disable bluetooth voicedialing while the lock screen is up. The strings need to go in ASAP so that the translation people can see then, although they are not yet referenced in the code.
* | Get all strings in for Wifi tetheringIrfan Sheriff2010-03-041-20/+19
| | | | | | | | | | Bug: 2413908 Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
generated by cgit v1.1 at 2025-02-19 09:53:18 +0000