PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,261 Commits 1 Branch 0 Tags
b0d54ca66083e945d0b51a3801e36873dd24c466
Commit Graph

3957 Commits

Author SHA1 Message Date
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
9517554534 am a262b5d1: am 273464d5: am aa1f8aee: Clarify backup setting 2010-06-03 15:10:59 -07:00
Kenny Root
a262b5d1a0 am 273464d5: am aa1f8aee: Clarify backup setting 
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken

* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
  Clarify backup setting
 2010-06-03 15:07:14 -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
3bf2d42490 am ca61c255: am a4966840: am de3e5665: Add phase2 authentication settings 2010-06-03 11:17:36 -07:00
Irfan Sheriff
ca61c25578 am a4966840: am de3e5665: Add phase2 authentication settings 
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken

* commit 'a496684019497395b71c6d460501197a74e21e0e':
  Add phase2 authentication settings
 2010-06-03 11:14:40 -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
Amith Yamasani
e7739d1ab5 Added an Input Method selector in Language settings 
Bug: 2132207 - Settings UI has no way to change IME
 2010-06-01 10:22:30 -07:00
Konstantin Lopyrev
57fbf694a5 Change I546ee2fb: Fix 2677197: Adding minimum complex character support. 
Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
 2010-05-27 16:04:49 -07:00
Dianne Hackborn
777e06c164 am 3f253cf2: am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP 2010-05-18 18:28:02 -07:00
Dianne Hackborn
3f253cf2d7 am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP 
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken

* commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef':
  Fix issue #2694643: Remove/Resolve STOPSHIP
 2010-05-18 15:28:29 -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
Konstantin Lopyrev
28efa02104 Making the choose password strings clearer 
Change-Id: Ib693145542972863677fa0a383278e95abfb239d
 2010-05-13 15:58:46 -07:00
Konstantin Lopyrev
015c186a24 Fix 2673731: Added password history 
Change-Id: I6198833e099ec1f33309dc26b28e0fd4a6edb288
 2010-05-12 17:16:24 -07:00
Robert Greenwalt
b12913368a am ddde146f: am 482eadea: am e434bfb2: String change - wifi tether = hotspot 2010-05-10 10:20:15 -07:00
Robert Greenwalt
ddde146f8d am 482eadea: am e434bfb2: String change - wifi tether = hotspot 
Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken

* commit '482eadeae85a1764b86133172d11364df6ce7227':
  String change - wifi tether = hotspot
 2010-05-10 10:16:29 -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
Daniel Sandler
039acfbdbf am a9523ed0: am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo 2010-04-21 18:28:03 -07:00
Daniel Sandler
70bb98ecd5 am 94440bd9: am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo 2010-04-21 18:28:01 -07:00
Daniel Sandler
a9523ed0fb am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo 
Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken

* commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7':
  Redesign vibration settings.
 2010-04-21 18:19:34 -07:00
Daniel Sandler
94440bd999 am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo 
Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken

* commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
  Labeled categories to help clarify Sound prefs.
 2010-04-21 18:19:31 -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
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
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
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
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
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
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