Commit Graph

644 Commits

Author SHA1 Message Date
Kenny Root
08c1d6c480 am db751db4: Import revised translations
Merge commit 'db751db4c919ea4ab981d52017b9741d386dad19' into froyo-plus-aosp

* commit 'db751db4c919ea4ab981d52017b9741d386dad19':
  Import revised translations
2010-06-21 09:14:55 -07:00
Kenny Root
db751db4c9 Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
2010-06-20 19:00:54 -07:00
The Android Open Source Project
00c406364e merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
2010-06-11 13:31:28 -07:00
Anders Hammar1
b2dd90383b Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.

Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
2010-06-11 14:27:29 +02:00
Kenny Root
97ece591a6 am dc2fdd09: Import revised translations
Merge commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into froyo-plus-aosp

* commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
  Import revised translations
2010-06-10 11:48:13 -07:00
Kenny Root
dc2fdd091f Import revised translations
Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34
2010-06-10 11:37:35 -07:00
Kenny Root
88f6b989d2 am a791e2d6: Import revised translations
Merge commit 'a791e2d63bfb5218db4890184e68381d4261818f' into froyo-plus-aosp

* commit 'a791e2d63bfb5218db4890184e68381d4261818f':
  Import revised translations
2010-06-09 23:04:13 -07:00
Kenny Root
a791e2d63b Import revised translations
Change-Id: Ib63294fbc8fedc0517f38bbffd4c0fe536866bdc
2010-06-09 22:59:20 -07:00
Kenny Root
e4c0cd6d8c am 365ef4a0: Update strings for backup
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp

* commit '365ef4a095189573b67573f6750f5891c11b7895':
  Update strings for backup
2010-06-03 17:05:06 -07:00
Kenny Root
365ef4a095 Update strings for backup
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
2010-06-03 16:42:00 -07:00
Kenny Root
273464d5a1 am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Irfan Sheriff
a496684019 am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
The Android Open Source Project
50c7f2d92a merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
2010-05-19 08:30:08 -07:00
Dianne Hackborn
fcc577b2a1 am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp

* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:26:17 -07:00
Dianne Hackborn
f9762a2c39 Fix issue #2694643: Remove/Resolve STOPSHIP
*poof*

Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
2010-05-18 15:22:32 -07:00
Henrik Tuszynski
de6007cbf8 A button in the master clear information screen was partly hidden.
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.

Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
2010-05-18 09:25:05 +02:00
Kenny Root
7a4cff13c9 am 28b245c0: Import revised translations
Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp

* commit '28b245c01d49b7710d1a918849fe8f159e8f43b5':
  Import revised translations
2010-05-17 11:45:04 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Henrik Hall
a7ece710fe Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version

Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
2010-05-11 13:38:44 -07:00
Robert Greenwalt
482eadeae8 am e434bfb2: String change - wifi tether = hotspot
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
2010-05-10 10:14:36 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Kenny Root
a359fb77d4 am 6d409870: Import revised translations
Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp

* commit '6d409870981361af2f547fba05877e7f405af75a':
  Import revised translations
2010-04-29 16:03:30 -07:00
Kenny Root
6d40987098 Import revised translations
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
2010-04-29 16:01:54 -07:00
Kenny Root
9fef437e04 am b3c872bf: Merge "Import revised translations" into froyo
Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp

* commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5':
  Import revised translations
2010-04-28 09:34:05 -07:00
Kenny Root
b3c872bf58 Merge "Import revised translations" into froyo 2010-04-28 09:23:34 -07:00
Kenny Root
eab62faea7 Import revised translations
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
2010-04-28 09:20:52 -07:00
Amith Yamasani
567ca0805e am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp

* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
  Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:08:20 -07:00
Amith Yamasani
64ab5338cb Fix regression in removing settings that aren't relevant for a platform.
Bug: 2630695

The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.

Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.

Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
2010-04-27 13:35:12 -07:00
Daniel Sandler
dd3791844f am f0746678: Merge "Redesign vibration settings." into froyo
Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp

* commit 'f07466782bb25ce4f2738133d0992f3531af28e5':
  Redesign vibration settings.
2010-04-21 18:15:40 -07:00
Daniel Sandler
9e2810bbed am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp

* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
  Labeled categories to help clarify Sound prefs.
2010-04-21 18:15:38 -07:00
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
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
Kenny Root
398213ec34 Import revised translations
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
2010-04-14 20:34:50 -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
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
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
af05891d31 Import revised translations
Change-Id: I7ce7aa7745bfb57870f1239dba8bd0bd714590dd
2010-04-03 14:02:57 -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
38947ddcfb Fix the build - doh.
Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
2010-03-30 14:45:00 -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
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