Commit Graph

892 Commits

Author SHA1 Message Date
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
Jeff Brown
7c5717c064 am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1' into froyo-plus-aosp

* commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1':
  Fix NPE in InstalledAppDetails activity when app not found.
2010-05-28 12:12:21 -07:00
Jeff Brown
b0bcf9f7f5 Fix NPE in InstalledAppDetails activity when app not found.
Added some extra checks to ensure that the activity exits from
onCreate, onResume and processMoveMsg promptly when the app
info cannot be refreshed.

Bug: b/2711730
Change-Id: Ied22fadce09326dd33cf201e5e9281990bf3abbd
2010-05-27 14:32:31 -07:00
Irfan Sheriff
c1a587c9e9 am f3373c99: No quotes for password
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp

* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
  No quotes for password
2010-05-26 13:04:05 -07:00
Irfan Sheriff
f3373c9949 No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.

Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
2010-05-26 12:53:24 -07:00
The Android Open Source Project
4811287623 merge from open-source master
Change-Id: Id9c258165d9bb326271218a562d782fa52608213
2010-05-19 09:12:47 -07:00
Irfan Sheriff
75a43c6054 am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo
Merge commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp

* commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448':
  Fix crash for tether with quotes in SSID
2010-05-17 13:29:00 -07:00
Irfan Sheriff
18dc7ea709 Fix crash for tether with quotes in SSID
Multiple quotes cause havoc with netd interaction right now.
The solution is to revert the changes for WifiConfiguration on
Access Point side done in Change I0f1e508b and remove all quotes
in the SSID.

Essentially a low risk one line change on top of the revert.

We dont expose API for WifiConfiguration on AP side. This solution
essentially means we treat SSID in WifiConfiguration on AP side
differently. When we do expose things, we should make things consistent.

Change-Id: I0a7e5074b83ace743fc843ee61c1ff86cde8267f
2010-05-17 13:20:39 -07:00
Christian Mehlmauer
0193bf8b3d Removed Calls to deprecated APIs and unused imports
Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
2010-05-17 21:25:15 +02:00
Chung-yih Wang
8719f0d20a am 8c81257f: Fix the double-quoted SSID issue.
Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp

* commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
  Fix the double-quoted SSID issue.
2010-05-14 23:16:25 -07:00
Chung-yih Wang
8c81257f70 Fix the double-quoted SSID issue.
Bug id http://b/issue?id=2684571

Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
2010-05-15 10:57:23 +08:00
The Android Open Source Project
0b53ac733c merge from open-source master
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
2010-05-12 09:33:50 -07:00
Romain Guy
d2bfade8f6 Merge "The password in the APN settings is shown instead of stars" 2010-05-11 10:51:12 -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
Michael Chan
15bb475456 am d2c81986: b/2652059 Refresh UI after bond state change
Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp

* commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2':
  b/2652059 Refresh UI after bond state change
2010-05-10 09:43:38 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Michael Chan
d2c81986c2 b/2652059 Refresh UI after bond state change
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
2010-05-07 15:24:22 -07:00
Michael Chan
d17eb48e9c am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair
Merge commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp

* commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e':
  b/2652059 Fixed the broken BT connects/disconnects after unpair
2010-05-04 12:36:27 -07:00
Michael Chan
1308453b16 b/2652059 Fixed the broken BT connects/disconnects after unpair
The unpair command was stuck in the queue.

Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
2010-05-03 23:06:51 -07:00
Michael Chan
3a1204f7cd am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo
Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp

* commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e':
  b/2630339 Fixed the crash when an app requests BT to be enabled
2010-04-28 13:14:35 -07:00
Michael Chan
a0de1dcd19 b/2630339 Fixed the crash when an app requests BT to be enabled
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.

Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
2010-04-28 11:24:00 -07:00
Michael Chan
0bca1653cb am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp

* commit '6368b25c09992172b1900da3fd326c4fd2fdd203':
  b/2608693 Fix the problem where BT was automatically reconnecting
2010-04-23 10:50:18 -07:00
Michael Chan
6368b25c09 Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo 2010-04-23 10:46:43 -07:00
Suchi Amalapurapu
b12b21a5b0 am b99e029d: Fix string for uninstall button for system apps.
Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp

* commit 'b99e029db14ae276a47da39da9378b6af9aef403':
  Fix string for uninstall button for system apps.
2010-04-22 21:04:01 -07:00
Michael Chan
96b0c1dc08 b/2608693 Fix the problem where BT was automatically reconnecting
... after the user unpaired while docked.

Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
2010-04-22 16:07:35 -07:00
Suchi Amalapurapu
b99e029db1 Fix string for uninstall button for system apps.
Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
2010-04-22 16:06:30 -07:00
Suchi Amalapurapu
a6bde3c9cd am a3683a51: Enable moving packages when install location is set to auto.
Merge commit 'a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp

* commit 'a3683a51faab316c1577cd13c708a41938bcc646':
  Enable moving packages when install location is set to auto.
2010-04-22 15:54:34 -07:00
Suchi Amalapurapu
a3683a51fa Enable moving packages when install location is set to auto.
Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
2010-04-22 13:42:41 -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
f07466782b Merge "Redesign vibration settings." into froyo 2010-04-21 17:37:01 -07:00
Robert Greenwalt
70631ab714 am 4c3b2f0c: Fix the tethering help page.
Merge commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp

* commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b':
  Fix the tethering help page.
2010-04-21 13:04:30 -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
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
Robert Greenwalt
4c3b2f0cf0 Fix the tethering help page.
It worked with language+country resources but for some resources it's just language.
Added a check to see if we had lanugage+country before deciding which to use.

bug:2605981
Change-Id: Icb667a51f0c376f5188e3a43f264e236cd265468
2010-04-19 12:22:48 -07:00
Irfan Sheriff
ea87b6d75c Merge "Stop scanning after errors" into froyo 2010-04-17 09:28:21 -07:00
Irfan Sheriff
e81497095b Stop scanning after errors
When scan fails for 3 times, we show a
failure toast and continue to scan.
In one case this caused infinite toasts,
until the user stopped wifi.

Its not clear what can cause this kind of
a state since wifi disable broadcast should
stop the scans. This fix will stop scans
after 3 continuous failures. Any wifi state
change will restart scan.

Bug: 2601937
Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
2010-04-16 14:56:54 -07:00
Irfan Sheriff
c190c4f535 Merge "Grey out wifi tethering in airplane mode" into froyo 2010-04-14 15:32:32 -07:00
Irfan Sheriff
2d4e135fec Grey out wifi tethering in airplane mode
When airplane mode is enabled, wifi tethering
should be disabled since there is no real
use case for it.

This also addresses the issue
of trying to restore Wifi (with tethering on)
when airplane mode is disabled.

Bug: 2594720
Change-Id: I7379ebed74a58b148ae82ed589d09aa2b9ca767d
2010-04-14 15:15:09 -07:00
Jim Miller
c02a09aa56 Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo 2010-04-14 14:47:48 -07:00
Suchi Amalapurapu
6023d0b93d Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo 2010-04-14 14:05:38 -07:00
Jim Miller
2deec7edc9 Fix 2594148: confirm PIN/Password before resetting device
This fixes a bug where user was allowed to factory reset the device
without entering their PIN/Password.

It also fixes the same issue with MediaFormat (Settings->SD Card->Format).

Change-Id: I0677a50aa771ad8663513fd7ec398a70953dcde2
2010-04-14 01:15:05 -07:00
Jim Miller
fc5a02225e Fix 2582241: Update selection based on user setting instead.
When the user adds a DPM, Settings removes all display
timeout options with t > maxTimeout. It was incorrectly
setting the preference to maxTimeout.

The corrected code picks the user's preference if less
than maxTimeout or nothing otherwise.

Change-Id: I5a47fdce89f4cf216fd76bb585c3c0120b39db92
2010-04-13 15:31:41 -07:00
Suchi Amalapurapu
30de84777b Fix 258181
Enable moving apps to external storage if install location is set and they had been
moved to internal storage.

Change-Id: I54b24303872dc525a86294c3d2b8c0c76dd366c5
2010-04-13 13:15:59 -07:00
Jean-Michel Trivi
fced126829 Fix bug 2577511 NPE in TTS Settings
A previous bug had caused incorrect settings to be saved, in
particular the default language variant was not stored, unlike
the default language and country. When settings were restored, this
caused an invalid group of settings to be loaded, with a null
language variant. The fix consists in:
- discarding invalid default language settings
- reevaluating which language should be selected in the list of
  available languages.

Change-Id: If58882a9acc28f14a78f6142fefa17d04ca4ad5d
2010-04-13 09:08:09 -07:00
Charles Chen
8ca7d88c1b Fixing bug #2591288
The language pref needs to be set after populating the entries
based on the selected engine.

Change-Id: I16db4428eee83052ff7c5115942eef4bf3d87454
2010-04-12 18:32:33 -07:00
Charles Chen
28e7651f80 Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo 2010-04-12 14:21:59 -07:00