PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,296 Commits 1 Branch 0 Tags
bbf8daf4602b62d806c4946196b526edbe08e056
Commit Graph

9296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
5cf1fcb9e4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-12 15:06:22 -08:00
Baligh Uddin
3af560670f am efacd47f: am 5b4509b5: Import translations. DO NOT MERGE 
* commit 'efacd47f4f2f9b5103cd3bf876b819904d881da6':
  Import translations. DO NOT MERGE
 2012-12-12 13:42:57 -08:00
Baligh Uddin
efacd47f4f am 5b4509b5: Import translations. DO NOT MERGE 
* commit '5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
  Import translations. DO NOT MERGE
 2012-12-12 13:40:49 -08:00
Baligh Uddin
badaeea803 am 92ff5ebe: Import translations. DO NOT MERGE 
* commit '92ff5ebe1e0bbb58b444c06d3e4b6887a3dbe120':
  Import translations. DO NOT MERGE
 2012-12-12 13:39:37 -08:00
Baligh Uddin
5b4509b5ad Import translations. DO NOT MERGE 
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
 2012-12-12 13:19:14 -08:00
Baligh Uddin
92ff5ebe1e Import translations. DO NOT MERGE 
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
 2012-12-12 13:17:55 -08:00
Amith Yamasani
004970da50 am 0df6a277: Merge "Grey out settings icon when it is in disabled state" 
* commit '0df6a2771d92e355e122195d3dceaf9a2b264ee5':
  Grey out settings icon when it is in disabled state
 2012-12-12 09:55:56 -08:00
Amith Yamasani
0df6a2771d Merge "Grey out settings icon when it is in disabled state" 2012-12-12 09:12:47 -08:00
The Android Open Source Project
7f5a3d10f8 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ia5cf13610d470a518ce526f8a46cb6241a28d124
 2012-12-12 07:34:17 -08:00
The Android Automerger
4d2a01d3a3 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-11 15:56:34 -08:00
Baligh Uddin
5c806da40c am 777688c9: am 67e9e59b: Import translations. DO NOT MERGE 
* commit '777688c9638efab8681453889a3d7917b4a52634':
  Import translations. DO NOT MERGE
 2012-12-10 21:14:56 -08:00
Baligh Uddin
777688c963 am 67e9e59b: Import translations. DO NOT MERGE 
* commit '67e9e59bc943481b091998ba114ca6750f46b383':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:41 -08:00
Baligh Uddin
e17335e982 am 3b10f0ba: Import translations. DO NOT MERGE 
* commit '3b10f0ba055fce7b8893897e88405bff0fb66fca':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:02 -08:00
The Android Open Source Project
c9b5f99c1d Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c
 2012-12-10 15:19:47 -08:00
Baligh Uddin
67e9e59bc9 Import translations. DO NOT MERGE 
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
 2012-12-10 10:57:09 -08:00