Commit Graph

9336 Commits

Author SHA1 Message Date
Jeff Sharkey
f8db32d8af am 74fd506b: Merge "Enable Ethernet tab in data usage"
* commit '74fd506bba9643221479ba11ae56a6657ed48279':
  Enable Ethernet tab in data usage
2013-03-20 10:21:53 -07:00
Jeff Sharkey
74fd506bba Merge "Enable Ethernet tab in data usage" 2013-03-20 17:08:25 +00:00
Jaewan Kim
ffce9c1e9a Enable Ethernet tab in data usage
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
2013-03-20 11:22:30 +09:00
Robert Greenwalt
cd1c38cf23 am ae9ebfd1: Merge "add MVNO field for APN Editor"
* commit 'ae9ebfd153d63beb03c018786cb3a7ca7610ce64':
  add MVNO field for APN Editor
2013-03-17 09:26:13 -07:00
Robert Greenwalt
ae9ebfd153 Merge "add MVNO field for APN Editor" 2013-03-16 00:55:30 +00:00
Elliott Hughes
93692c3632 am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
* commit '53309365f60b317b032e55643e9eb0122c6fbb3f':
  use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
2013-03-13 18:17:56 -07:00
Elliott Hughes
53309365f6 Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog" 2013-03-14 00:12:48 +00:00
Sungmin Choi
7ccfa0614c use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
In case of using DatePickerDialog, user could select any date
before 1970-01-01. However, the system clock cannot be set to
a date before 1970-01-01.
As a result, user couldn't select date before 1970-01-01.
So, use date from 1970-01-01 to 2037-12-31 of DatePickerDialog.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1970 and Done

Change-Id: I075b3fcaa86df1c314c85dd3dd85474a28b8c637
2013-03-13 17:11:28 -07:00
Amith Yamasani
8749f35f71 am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
* commit '506b68e1c586ea3956c939c4181f11e5a112a2f5':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
2013-03-12 15:42:57 -07:00
Amith Yamasani
506b68e1c5 Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY" 2013-03-12 21:56:42 +00:00
Jean-Baptiste Queru
565af3834c am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '33adccd203ee8303cd0bf489e3f072d362e1705d':
2013-03-11 13:13:41 -07:00
Jean-Baptiste Queru
33adccd203 am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':
2013-03-11 13:00:49 -07:00
Jean-Baptiste Queru
9cff5e3f4a am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':
2013-03-11 12:42:01 -07:00
Jean-Baptiste Queru
f4b1aefbaa am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8638eeb4e925009fcc91fd9a9965740c25fe518a':
2013-03-11 12:27:42 -07:00
Jean-Baptiste Queru
8638eeb4e9 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:22:07 -07:00
Henrik Baard
2ac8da37d8 Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
There is an array (NEED_VOICE_CAPABILITY) with all keys that
should not be present in a device that does not have voice
capability.

The key KEY_VIBRATE was not part of this array, it was handled
separately in the code.

Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the
special treatement.

Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164
2013-03-11 13:40:46 +01:00
Amith Yamasani
6e0bff0d1b Merge "Fix the message when Bluetooth is turning off while on the tethering menu." 2013-03-08 18:24:22 +00:00
Ryan Baxter
232e6fb382 Fix the message when Bluetooth is turning off while on the tethering menu.
Currently says "Turning Wifi off..."
This change will display "Turning Bluetooth off..." instead.

Change-Id: I697d19ca4d7a69cc6b3729ad09fcf38bf5ab2427
Signed-off-by: Ryan Baxter <rbryanbaxter@gmail.com>
2013-03-07 20:36:22 -05:00
Irfan Sheriff
ba6a68c8c1 Merge "Fix not updating error message when authentication fails" 2013-03-05 19:08:15 +00:00
Jaewan Kim
0085de7999 Fix not updating error message when authentication fails
If attempt to configure the first network fails, AccessPoints fails to
update error message because it only checks the error code if it is not
active.

With this change, user may see saved network message for a second
because SupplicantStateTracker retries on authentication failure so
intermediate status is displayed between each trial.

Bug: 8284024
Change-Id: I8b976b03878e27e46726ee8a176f131115b7a409
2013-03-05 12:59:56 +09:00
Sungmin Choi
aa4d4c653b add MVNO field for APN Editor
For MVNO, add related data fields.

Bug: 8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819
2013-02-28 13:20:39 +09:00
Wink Saville
a7d2fd80c2 Merge "avoid stopping app in case of accessing empty db" 2013-02-20 23:07:59 +00:00
Amith Yamasani
a5f756c9e6 Merge "Prevent cursor from causing global reference leaks." 2013-02-20 16:57:51 +00:00
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
Hyejin Kim
88c80b10a2 avoid stopping app in case of accessing empty db
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null for cursor

Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
2013-02-16 01:02:30 +09: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
Per Allard
5416d07100 Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.

Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
2013-02-01 08:09:04 +01: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