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
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
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
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
a374d81605
Distinguish adding an already present word / cancelling
...
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
2012-12-17 15:52:07 +09: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
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
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
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
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
Elliott Hughes
68066a7835
am e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."
...
* commit 'e2d893e2af36e4ede8d1ec074912563ae6ecf7ef':
Makes the add button for new APNs appear in the action bar.
2012-12-08 10:57:51 -08:00
Elliott Hughes
e2d893e2af
Merge "Makes the add button for new APNs appear in the action bar."
2012-12-08 09:55:09 -08:00
Wink Saville
4e0391a733
am 49c4de7f: Merge "Format change at "Mobile network type" value"
...
* commit '49c4de7f139a1a3a60dc8f7e72acae710dba506f':
Format change at "Mobile network type" value
2012-12-07 12:18:53 -08:00
Amith Yamasani
b722b80da8
am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages.
...
* commit 'b7d94e74e1342c5583883e596fd268745a5a25b6':
Pass the locale code in the help url for help pages.
2012-12-07 10:45:30 -08:00
Amith Yamasani
aeb57edaef
Pass the locale code in the help url for help pages.
...
Otherwise the help will always be shown in English.
Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
2012-12-06 14:40:51 -08:00
Akira Oshimi
1fd3544c55
Format change at "Mobile network type" value
...
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".
For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)
The number ":0" did not add much value to the user.
Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
2012-12-06 09:52:55 +01:00
Jake Hamby
ac9bb0bdc0
am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status screen.
...
* commit 'b39ab37aa0e8be02a61c4245c181e523419ba703':
Add latest area info broadcast to Settings status screen.
2012-12-04 20:09:34 -08:00
Jake Hamby
bc5d9271a9
Add latest area info broadcast to Settings status screen.
...
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.
Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
2012-12-04 18:18:55 -08:00
Danielle Millett
783d0e7d9d
am a5ca5158: am 49562681: Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev
...
* commit 'a5ca51587d2fe3872f9e8610b5bd6e3e29bdefb1':
Removing tutorial for choosing a pattern as part of b/7459863
2012-11-30 18:31:26 -08:00
Danielle Millett
495626818d
Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev
2012-11-30 18:26:58 -08:00
Jeff Sharkey
f41b76430d
am 3f5c8ede: am 5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
...
* commit '3f5c8ede376ecd0ea5610414a2f99191931ae77b':
Push scrollbars to screen edges.
2012-11-30 17:48:46 -08:00
Jeff Sharkey
1ed3d1c820
am 1d3dbecd: am b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
...
* commit '1d3dbecd9c76e0475f77d5bb443cd06018513944':
Fix incorrectly inverted text color.
2012-11-30 17:46:17 -08:00
Jeff Sharkey
5e337eda4f
Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
2012-11-30 17:44:53 -08:00
Jeff Sharkey
b0f3f8dbea
Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
2012-11-30 17:44:23 -08:00
Amith Yamasani
5ddbefbe7b
am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
...
* commit '64e327e1ef441491e700270e24299912aea8d6fe':
Disable USB debugging checkbox and backup password for secondary users
2012-11-30 16:46:06 -08:00
Amith Yamasani
1cadd481bc
Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
2012-11-30 16:42:05 -08:00
Jeff Sharkey
97d07fa3ae
Push scrollbars to screen edges.
...
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.
Bug: 7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
2012-11-30 16:15:09 -08:00
Amith Yamasani
48d000ee2e
Disable USB debugging checkbox and backup password for secondary users
...
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.
Bug: 7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
2012-11-30 14:20:04 -08:00
Jeff Sharkey
8f28cd5d75
Fix incorrectly inverted text color.
...
Bug: 7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
2012-11-30 12:32:58 -08:00
Daniel Sandler
8a8a265b88
am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
...
* commit 'aea3fbde280107738281f568cb1f4d860f50abfc':
Add android.settings.DREAM_SETTINGS for Daydream settings.
2012-11-30 11:02:23 -08:00
Daniel Sandler
77ec6de156
Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
2012-11-30 10:58:04 -08:00
Evan Charlton
a835f66ec7
am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
...
* commit 'b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
Use plurals for the developer steps countdown
2012-11-30 10:20:38 -08:00
Evan Charlton
6c269982f3
Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
2012-11-30 10:15:25 -08:00
Jeff Sharkey
129605270a
am 90dbd693: am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
...
* commit '90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
Use uniform font size for APNs and timezones. DO NOT MERGE.
2012-11-29 18:02:09 -08:00
Jeff Sharkey
2f12147e91
am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
...
* commit 'a04497d70cc4f422cfa36c5be2f35a6170d5725a':
Avoid split action bar when it only has one item. DO NOT MERGE.
2012-11-29 18:02:08 -08:00
Jeff Sharkey
4166ec39ec
Use uniform font size for APNs and timezones. DO NOT MERGE.
...
Also get rid of some orange highlight!
Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
2012-11-29 14:50:11 -08:00
Jeff Sharkey
c2b43dbee8
Avoid split action bar when it only has one item. DO NOT MERGE.
...
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
2012-11-29 14:50:02 -08:00
Jake Hamby
26a67fd181
am c5190506: am 0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
...
* commit 'c51905067793a3f18c94df79eb15472cbb58322f':
Fix Bluetooth enable dialog to match Android style guide.
2012-11-29 14:28:50 -08:00
Dianne Hackborn
8afda9efce
am ac4bfa60: am af604801: Merge "Be quiet!" into jb-mr1.1-dev
...
* commit 'ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
Be quiet!
2012-11-29 14:26:34 -08:00