Commit Graph

1374 Commits

Author SHA1 Message Date
Daniel Sandler
2c917847f5 Redesign vibration settings.
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
2010-04-21 15:29:34 -04:00
The Android Open Source Project
64a2d0c0fe am 1795d18f: am 2c3265af: merge from open-source master 2010-04-21 10:18:33 -07:00
The Android Open Source Project
1795d18f81 am 2c3265af: merge from open-source master
Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken

* commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40':
  Display current IP address in advanced Wifi settings screen
2010-04-21 09:51:01 -07:00
The Android Open Source Project
2c3265af74 merge from open-source master
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
2010-04-21 09:46:57 -07:00
Daniel Sandler
8ad849ca26 Labeled categories to help clarify Sound prefs.
Bug: 2598014
Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
2010-04-21 08:52:59 -04:00
Mike Lockwood
68b8069862 Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-20 13:52:38 -04:00
Freeman Ng
73f877a68d text changes to language picker
bug: 2129684

Change-Id: I0a525c32b1b2712d6d38fa202834931a3deeed2d
2010-04-16 17:43:32 -07:00
Kenny Root
9789ca7df0 am ee381422: Merge "Import revised translations" into froyo
Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken

* commit 'ee3814226706eb0600928c573254997c4ac148b9':
  Import revised translations
2010-04-15 06:43:16 -07:00
Kenny Root
398213ec34 Import revised translations
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
2010-04-14 20:34:50 -07:00
Jim Miller
4b2209e9ef am 91523d60: Fix 2579923: Update language to make consistent with related feature.
Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken

* commit '91523d601a6569ce9295a5617ca92a24582ff502':
  Fix 2579923: Update language to make consistent with related feature.
2010-04-12 17:55:56 -07:00
Jim Miller
91523d601a Fix 2579923: Update language to make consistent with related feature.
Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
2010-04-12 17:43:41 -07:00
Jim Miller
e587fb670a am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo
Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken

* commit '0b326a6fad8caf250b61cc49b962495202562a5c':
  Fix 2579923: Make changing lock screen method more discoverable.
2010-04-12 13:55:43 -07:00
Jim Miller
bbb4afa19f Fix 2579923: Make changing lock screen method more discoverable.
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
2010-04-11 23:28:33 -07:00
Charles Chen
df7d8ee6a5 am 8c8185b2: Fixing bugs 2577511 and 2581920. 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
Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken

* commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f':
  Fixing bugs 2577511 and 2581920.
2010-04-08 22:42:14 -07:00
Charles Chen
8c8185b260 Fixing bugs 2577511 and 2581920.
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
2010-04-08 16:51:35 -07:00
Kenny Root
6e117870e8 am af05891d: Import revised translations
Merge commit 'af05891d31bf86e12910602be305a61fdcf1ace7' into kraken

* commit 'af05891d31bf86e12910602be305a61fdcf1ace7':
  Import revised translations
2010-04-03 14:13:50 -07:00
Kenny Root
af05891d31 Import revised translations
Change-Id: I7ce7aa7745bfb57870f1239dba8bd0bd714590dd
2010-04-03 14:02:57 -07:00
Daniel Sandler
f57e067056 am 1ce25342: Merge "Restore dependency between volume settings and silent mode." into froyo
Merge commit '1ce25342bfe918f60a895f5dc6b7feac3e1d6174' into kraken

* commit '1ce25342bfe918f60a895f5dc6b7feac3e1d6174':
  Restore dependency between volume settings and silent mode.
2010-04-02 11:00:27 -07:00
Daniel Sandler
1ce25342bf Merge "Restore dependency between volume settings and silent mode." into froyo 2010-04-02 10:53:17 -07:00
Mike LeBeau
e81d23819c am 38947ddc: Fix the build - doh.
Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken

* commit '38947ddcfb2411d380d631ebfc29d66b11821879':
  Fix the build - doh.
2010-03-30 14:53:38 -07:00
Mike LeBeau
38947ddcfb Fix the build - doh.
Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
2010-03-30 14:45:00 -07:00
Mike LeBeau
898c7e1862 am e076bef9: Add new string to identify what speech recognizer the settings are for.
Merge commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2' into kraken

* commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2':
  Add new string to identify what speech recognizer the settings are for.
2010-03-30 14:24:55 -07:00
Mike LeBeau
e076bef97d Add new string to identify what speech recognizer the settings are for.
http://b/2546173

Change-Id: I7d59a69eba0e4f3c87586c968574d291a200352c
2010-03-30 14:16:34 -07:00
Daniel Sandler
7811009111 Restore dependency between volume settings and silent mode.
Volume (of the ringer, notifications, media, and alarms) may
no longer be adjusted while the phone is in silent mode.
This was the behavior in Eclair and earlier releases.

This rolls back a small portion of change I724c43aa in the
interest of stability (see bugs listed below for weirdness
that occurs when the ringer's SeekBarVolumizer is visible
when the ringtone stream is muted).

Bug: 2552268
Bug: 2544706
Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
2010-03-30 14:55:23 -04:00
Kenny Root
bb2ddbba63 am c0b5624c: Import revised translations
Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken

* commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b':
  Import revised translations
2010-03-30 09:46:20 -07:00
Kenny Root
c0b5624ccc Import revised translations
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
2010-03-30 09:33:49 -07:00
Oscar Montemayor
6f72be68c1 DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
2010-03-26 18:45:05 -07:00
Jim Miller
b11e275a99 Fix 2535700: Strings for additional security policies.
Change-Id: Icd2f31ae5393ee7b26113d8c3f31ef06b3469939
2010-03-22 19:36:34 -07:00
Irfan Sheriff
9775dc9515 Add password hint and fix settings crash
Bug: 2534348
Bug: 2533980
Change-Id: I2f220ac9c710869d3f93a56557afb33478c3b323
2010-03-22 15:33:44 -07:00
Charles Chen
7ed0c47ce7 Fixing a bug that causes a crash when Install voice data is clicked
in the TTS settings.

Change-Id: Ia9992f105652518a37ba7e4c139810bfc76c6252
2010-03-18 18:50:32 -07:00
Kenny Root
c42bee0702 Import revised translations
Change-Id: I0f81ee1b861fa5df40700baccc29e2e6c52a39d1
2010-03-17 22:15:56 -07:00
Charles Chen
9bb75d3677 Merge "Adding plugin specific settings to TTS settings + changing the UI to be more like the IME settings." 2010-03-16 20:53:56 -07:00
Charles Chen
0a0eb5f7e8 Adding plugin specific settings to TTS settings + changing the UI
to be more like the IME settings.

Change-Id: I0d26042262b4d9e636d3f456e867c725fa56ae55
2010-03-16 20:32:18 -07:00
Irfan Sheriff
47ebb78954 softAp UI changes
Remove channel settings
Add subtext error handling
Remove WEP, keep WPA2 only for now

Bug: 2413908
Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
2010-03-16 16:03:13 -07:00
Adam Powell
9077c6dc69 Fix bug 2513041
Set layout_height to match_parent

Change-Id: I390f10bf48e08f1e999e766438e50f36f4c73b99
2010-03-16 15:52:19 -07:00
Robert Greenwalt
c3c93e5c62 Add Tether Help UI.
Add a "Help" button to the tethering page that loads on-device html.

Change-Id: I816ec552a4433296a6cb57345a37611eb2a92b37
2010-03-15 17:21:16 -07:00
David Brown
6e101d125a Add "Power button ends call" accessibility setting.
This is part 3 of the fix for bug 2364220 "Accessibility improvements for
ending calls".

This change adds a checkbox under "Accessibility settings" to control the
new Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR value, which allows the
user to specify that the Power button should hang up while in-call
(instead of just turning off the screen.)  The checkbox is only shown on
devices that actually have a POWER button.

Yeah, it's a little strange having this under Accessibility (since it's not
that obvious *why* this feature is accessibility-related), but there's no
obvious better place.  See discussion in the bug for more info.

Bug: 2364220

Change-Id: I0fd7cf357972519b390575b9c06a4bbe46ff1c9b
2010-03-11 17:39:11 -08:00
Roy West
40d9f1b8ea Minor edits to strings related to SD card work.
Change-Id: I8a700485f538d3179334557a5485fe2205be14a9
2010-03-11 17:13:51 -08:00
Suchi Amalapurapu
5cc062f1cd Add new error dialog when moving apps fails.
Change-Id: I3b1c815ff5f515c2116771e0392cf91fbfaea9f4
2010-03-10 16:39:09 -08:00
Irfan Sheriff
41297ef73a Fix Wi-Fi title reference in settings
Change-Id: Ia17df113bb6dfdc6af1b5d3632a7594f21365485
2010-03-09 13:58:04 -08:00
Robert Greenwalt
204e7c1a6e Clean up the tethering settings screen a bit.
Change-Id: Iadd1cf9245a5ccd38537050a6b6c9d9390400b20
2010-03-09 11:19:37 -08:00
Eric Fischer
cbc2d324f6 Use only the zh_Hant data file to make the zh_TW time zone list in Settings.
Bug 2291444

Change-Id: Ifce1a89ab051b79bfcf6a376ebd674f09d6cc3c4
2010-03-08 17:56:58 -08:00
Daniel Sandler
29a6e1caa1 Merge "Remove dependencies within Sound settings." 2010-03-08 14:08:34 -08:00
Daniel Sandler
0be152c9bc Remove dependencies within Sound settings.
All checkboxes and other settings will be available to the
user regardless of whether the device is in silent mode.
(Previously, settings such as ringtone and volume were
dimmed if the phone was silent, which was inconvenient.)

Bug: 2496164
Change-Id: I724c43aa4f5b1a12b95097381844a47c5dcf1e0d
2010-03-08 15:50:34 -05:00
David Brown
fdee92f135 Add Settings strings for power button behavior (accessibility)
Bug: 2364220
2010-03-08 12:46:16 -08:00
Robert Greenwalt
209177aac6 Update Tethering UI
Finalizing some strings and changing the error handling.
2010-03-04 18:24:11 -08:00
Martin Hibdon
b15f8cf1ff Fix previous Settings string checkin
There was a typo in my previous checkin.
2010-03-04 18:04:52 -08:00
Martin Hibdon
cc8733d5b3 Add new strings to Settings
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.
2010-03-04 17:57:38 -08:00
Irfan Sheriff
2ae37e8ce0 Get all strings in for Wifi tethering
Bug: 2413908
Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
2010-03-04 17:40:43 -08:00
Jean-Michel Trivi
a08f5a5b8c Use sentence-style capitalization for the "Languages and voices"
section in the TTS settings screen.
2010-03-04 17:05:47 -08:00