Commit Graph

908 Commits

Author SHA1 Message Date
Ben Clark
844d2a34a2 Remove unused imports in SecuritySettings.java
Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
2010-07-24 23:06:16 +01:00
Ben Clark
289244a88e Remove unused variable and associated import
Change-Id: I5d83cf68c1604b252e860c6b3258654fcae7a589
2010-07-19 13:03:20 -07:00
Jiehua.Dai
20108e2ed6 Fix window leak problems in settings.
There were window leak in the settings application.
These leak happens when an AlertDialog displays, rotate the phone,
then it would cause window leak.

Change-Id: I914897bf657933efea72eeea66076dc288098420
2010-07-14 11:10:00 +02:00
The Android Open Source Project
8d770c707b merge from open-source master
Change-Id: I5d1276f8343d9f590616dc2ab91e0164b2d31426
2010-06-15 09:36:38 -07:00
Jean-Baptiste Queru
2d40cdb894 Merge "Disabled verbose logging" 2010-06-14 16:39:36 -07:00
The Android Open Source Project
c7984e5d07 merge from open-source master
Change-Id: Iaaf6c1098fc0c5a44a7450d790ccaf2b1d2f64bb
2010-06-14 14:30:58 -07:00
Jean-Baptiste Queru
476bc5af86 Merge "replaced deprecated setButton methods" 2010-06-14 12:18:24 -07:00
Jean-Baptiste Queru
424b69c63f Merge "Replaced deprecated String Constructor" 2010-06-14 12:13:56 -07:00
The Android Open Source Project
b817cb6e39 merge from open-source master
Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
2010-06-14 11:08:28 -07:00
Jean-Baptiste Queru
3ba01ea0d1 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:25:34 -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
Christian Mehlmauer
b8eb474b92 Disabled verbose logging
Change-Id: If4612b5c045fb9819ab0668a628933a530606262
2010-06-05 14:42:00 +02: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
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
Christian Mehlmauer
58702fea9b replaced deprecated setButton methods
Change-Id: Ic112dc6acdb62586db741e996b0344d38c71d12f
2010-05-25 19:31:39 +02:00
Christian Mehlmauer
a06b4e69aa Replaced deprecated String Constructor
Change-Id: I452400c9cb00b60316b0270b2f4a68c15d80b698
2010-05-25 19:25:05 +02:00
Christian Mehlmauer
82163dec18 replaced deprecated getIntent with parseURI
Change-Id: Iabf82ff0f9be2a76dece9aafe8603bf83ac7d049
2010-05-25 18:39:46 +02: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