Commit Graph

9311 Commits

Author SHA1 Message Date
Irfan Sheriff
ff5b96fb19 Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage
2013-02-15 23:42:50 +00:00
Irfan Sheriff
a51d1fb345 Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
2013-02-15 15:38:21 -08:00
Irfan Sheriff
0e22188088 Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
2013-02-15 15:38:00 -08:00
Irfan Sheriff
ce68912621 Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.

Allow only support configs for various EAP methods

Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
2013-02-15 15:37:19 -08:00
Irfan Sheriff
f3a0201202 Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen

Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
2013-02-15 15:36:51 -08:00
Amith Yamasani
1ef6a106d5 Merge "Fix Settings app crash after enabled multi-user" 2013-02-15 17:15:41 +00:00
Kenny Root
bbe409d3ce Merge "KeyStore: stop using state()" 2013-02-14 20:18:11 +00:00
Kenny Root
ca714d8d0c KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
2013-02-14 12:06:38 -08:00
Irfan Sheriff
5c879e48ed am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c6928581d4f91b008c109a6a4630bfaae':
  P2PSetting:Avoid p2p_find on group removal event
2013-02-06 11:16:24 -08:00
Irfan Sheriff
414d9e9c69 Merge "P2PSetting:Avoid p2p_find on group removal event" 2013-02-06 18:13:59 +00:00
sunil duttu
7c872478eb P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
2013-02-06 23:18:30 +05:30
Irfan Sheriff
6639dee497 am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '203631b24cd3947bcba2ab24789e4cfec487eff7':
  wifiSettings: Updating the networkinfo on supplicant event
2013-02-06 08:58:31 -08:00
Irfan Sheriff
203631b24c Merge "wifiSettings: Updating the networkinfo on supplicant event" 2013-02-06 16:42:45 +00:00
sunil duttu
f99d52cf71 wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.

Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
2013-02-06 12:04:37 +05:30
Jaewan Kim
bb0e621f18 Fix Settings app crash after enabled multi-user
Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
2013-02-04 15:36:17 +09:00
Dianne Hackborn
bbf8daf460 am 505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '505232be07e388c602529e14254df013637b16f2':
  Fix of Settings application sort crash
2013-01-24 17:09:13 -08:00
Dianne Hackborn
505232be07 Merge "Fix of Settings application sort crash" 2013-01-25 01:02:58 +00:00
Irfan Sheriff
61b0f8c88a am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit 'b1ea6805d98bf953448db350ae33e53c3c3b797d':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
2013-01-24 11:30:12 -08:00
Irfan Sheriff
b1ea6805d9 Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot" 2013-01-24 18:50:05 +00:00
Venkataraman Nerellapalli
7d4ddaa043 Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.

Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a
2013-01-23 09:12:14 +01:00
Amith Yamasani
a6c51f3d0b am 7b8b6618: Merge "Fix for battery temperature display"
* commit '7b8b6618219a2a9e1402858b513cf19628033204':
  Fix for battery temperature display
2013-01-22 16:20:28 -08:00
Amith Yamasani
7b8b661821 Merge "Fix for battery temperature display" 2013-01-23 00:09:51 +00:00
Irfan Sheriff
814db19c46 am 67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '67995f973dd524ba20983b9246a17a10746c4590':
  Fix for F/C in WifiConfigInfo
2013-01-22 15:12:22 -08:00
Irfan Sheriff
67995f973d Merge "Fix for F/C in WifiConfigInfo" 2013-01-22 22:58:20 +00:00
Elliott Hughes
d7d5b33bcd am 375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '375b6d985be9203fb221eb42810e586e196c34f8':
  Force closed at settings application when delete Misc files
2013-01-22 07:58:42 -08:00
Elliott Hughes
375b6d985b Merge "Force closed at settings application when delete Misc files" 2013-01-22 15:43:05 +00:00
Jia Arlan
dffcc39ba5 Fix of Settings application sort crash
The original implementation of compareTo function
will sometimes cause crash when the power usage list
above 32 items.

When comparing double values a proper comparison method
needs to be used. Using just subtraction does not take
into account NaN:S, infinities and +/-0 numbers. In certain
cirtumstances it seems that using subtraction causes
compareTo to return values that is not expected by the
sorting code and causes an illegal argument exception with
"Comparison method violates its general contract!".

This problem only happens if the sort code is called arrays
containing more than 32 (currently) due to how
ComparableTimSort works (call chain is Collections.sort ->
Arrays.sort(Object[]) -> ComparableTimSort.

Change-Id: If732f04797a3c8b2a43568c90bb73a1ec69a4c98
2013-01-21 14:22:49 +01:00
Shuhrat Dehkanov
15a6869fce Fix for F/C in WifiConfigInfo
1. Turn off Wi-Fi
2. Open the dialer and input *#*#4636#*#*
3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately,
Settings has stopped" dialog.

Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
2013-01-19 21:50:06 +09:00
ikbae.kim
475b99cba2 Fix for battery temperature display
Centi temperature under zero degree is displayed with '-' sign.
Fix this using absolute value in centi degree display.

Change-Id: If4958d9c75c03d1f3ecfd14436fc80dc2fd57860
2013-01-19 17:42:49 +09:00
Predrag Stanojevic
aee4b75aba Force closed at settings application when delete Misc files
NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.

Change-Id: I13aac19949826b385610fd1fee2befb411684023
2013-01-18 08:56:19 +01:00
Elliott Hughes
52d623ede4 am f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit 'f141594c0507dccd26e876bf2cd40ba15a34d68b':
  Correct check box visibility in Display / Brightness
2012-12-20 11:03:50 -08:00
Elliott Hughes
f141594c05 Merge "Correct check box visibility in Display / Brightness" 2012-12-19 16:11:15 -08:00
The Android Open Source Project
a6dd202da1 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
2012-12-18 09:44:44 -08:00
Benn Porscke
106cf669c1 Correct check box visibility in Display / Brightness
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.

Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
2012-12-18 10:38:41 +01:00
The Android Automerger
29a4eb7a33 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-17 20:49:51 -08:00
Jean Chalard
5031683a72 am d0a9d5b6: am a374d816: Distinguish adding an already present word / cancelling
* commit 'd0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
  Distinguish adding an already present word / cancelling
2012-12-17 10:46:29 -08:00
Jean Chalard
d0a9d5b6e0 am a374d816: Distinguish adding an already present word / cancelling
* commit 'a374d81605f4ba760db9613dd8aa8d8a0370dab8':
  Distinguish adding an already present word / cancelling
2012-12-17 10:44:36 -08:00
Jean Chalard
a374d81605 Distinguish adding an already present word / cancelling
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
2012-12-17 15:52:07 +09:00
The Android Open Source Project
aca1bb4ab8 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
2012-12-14 14:03:38 -08:00
The Android Automerger
6db1e2495d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-14 13:56:20 -08:00
Mike Cleron
6d3925ce5b am 49ce96a1: am 1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '49ce96a14be5d414128b9e8ca12de281b610a57f':
  Call back to whom requested to add a word to the user dict
2012-12-14 11:00:28 -08:00
Mike Cleron
49ce96a14b am 1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '1f597c8764b375bf87d411d11a29b2808e1d2ef9':
  Call back to whom requested to add a word to the user dict
2012-12-14 10:59:17 -08:00
Mike Cleron
1f597c8764 Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev 2012-12-14 10:57:18 -08:00
Jean Chalard
e3f1171309 Call back to whom requested to add a word to the user dict
Bug: 7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
2012-12-14 18:08:05 +09:00
The Android Automerger
76a1152108 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:57 -08:00
Irfan Sheriff
9c65a7fdf4 am 878072a1: am 2a9cbb61: am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '878072a11a4f481e99cdc499752b72d14a03090d':
  Fix wifi compareTo
2012-12-13 11:34:46 -08:00
Irfan Sheriff
878072a11a am 2a9cbb61: am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
  Fix wifi compareTo
2012-12-13 11:32:51 -08:00
Irfan Sheriff
2a9cbb61b3 am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo
2012-12-13 11:30:41 -08:00
Irfan Sheriff
f197105e3b Merge "Fix wifi compareTo" into jb-mr1-dev 2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6 Fix wifi compareTo
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
2012-12-13 11:00:24 -08:00