Commit Graph

46 Commits

Author SHA1 Message Date
Wink Saville
5543404ae0 Use telephony-common
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-11 15:08:15 -07:00
Amith Yamasani
404e3a7592 am b3c17c57: Merge "Removing static reference from sUnknown"
* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
  Removing static reference from sUnknown
2012-05-02 17:22:40 -07:00
Robert Greenwalt
e37f427cbb Use the framework rather than RIL constants
bug:5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
2012-02-17 15:25:14 -08:00
Gustavo Waku
41e70e67fa Removing static reference from sUnknown
Removing static reference from field sUnknown
allows framework to handle properly resources.
Current implementation holds an instance of
sUnknown, final user sees "Unknown" field on the
IMEI SV [ Menu > About > Status ] even if the
language set is other than english.

Change-Id: I6345f578577e631782c0598bfa44ff4de04c6261
2012-01-25 00:32:32 -02:00
tk.mun
7c5c16565e Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:16:18 -08:00
Amith Yamasani
6822b749bb Show IP address of current active link instead of just the WiFi IP address.
Bug: 5359194

Show "Unavailable" only if there's no active link.

Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
2011-10-17 16:55:54 -07:00
Robert Greenwalt
8af88fb838 Use the new isNetworkSupported api for wifi-only
Didn't have an API for this before so people used a hacked system property (ro.carrier)
to determine if the device supported mobile data.  Added new API and switching callsites.

bug:5087537
Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614
2011-08-31 16:45:39 -07:00
Amith Yamasani
a4379d6b38 Use a different wallpaper fragment title from the preference item.
Change wallpaper list ordering to alphabetic.
Display battery level and charging status in Battery settings.

Change-Id: I8ead0fb0f018c79ed258bd1c1ca3f8ecaf32da83
2011-07-25 14:09:57 -07:00
John Wang
25bd33e1cf am d7b2dccb: Display IMEI and ICCID for LTE device.
* commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8':
  Display IMEI and ICCID for LTE device.
2011-07-13 10:54:17 -07:00
John Wang
d7b2dccbe6 Display IMEI and ICCID for LTE device.
Display IMEI nad ICCID in About tablet / Status for LTE devices.

bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b
2011-07-13 10:25:29 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
2011-06-06 16:29:34 -07:00
sy310.choi
95364e4af3 Allow alternate string to be used for min_number
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
2011-05-26 10:45:07 -07:00
TK MUN
36469186b7 DO NOT MERGE WiMAX settings menu
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-09 23:02:21 -08:00
Amith Yamasani
0c62c6449b am 38d3353e: am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb
* commit '38d3353e37be450b1b95d2525acbd53e9b67130e':
  Remove more entries not relevant to wifi-only devices.
2011-03-02 12:53:31 -08:00
Amith Yamasani
c06d4c48a9 Remove more entries not relevant to wifi-only devices.
Bug: 3488384
Bug: 3487976
Bug: 3488381

Removed Cell standby entry from Battery use screen.
Removed Mobile signal strength from BatteryHistory screen.
Added wifi IP address to About->Status
Remove auto-timezone checkbox in Settings->Date & time

Change-Id: I228721a3613b1aeb600026e42274337886552698
2011-03-01 12:03:24 -08:00
Doug Zongker
e18897bc22 am 26c433c1: am 489c7bff: show Build.SERIAL in settings > about > status
* commit '26c433c1c64416aed4736bb5a76b0ac4585958a1':
  show Build.SERIAL in settings > about > status
2011-02-25 17:30:55 -08:00
Doug Zongker
489c7bff5c show Build.SERIAL in settings > about > status
For wifi-only devices, this may be the only way we have to identify
the device.

Change-Id: I70c09e4cdb101282e5d085bcab3f57c890bc7a98
Bug: 3490911
2011-02-25 15:01:50 -08:00
Wink Saville
882c74a679 Changes for ril.h version 6.
Change-Id: I7e269e5a971c70d6d9a1731b82c538b722cbc01d
2011-02-17 12:00:03 -08:00
Amith Yamasani
b409b904d6 Bring back the MDN (phone number) status even if there's no voice.
Needed for carrier customer support purposes.

Bug: 3351493

Change "My phone number" string to "MDN".

Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1
2011-01-24 11:40:31 -08:00
Amith Yamasani
ffe813c380 Remove phone number status conditionally for devices without voice.
Bug: 3041861

Change-Id: I36fb6c584c24b995da0ac4e3b41d860f3a6f5396
2011-01-11 12:18:28 -08:00
David Brown
f42d5e7e2e Fix 2520977: NPE in com.android.settings.deviceinfo.Status
In normal operation, Phone.getLine1Number() returns an empty string if the
device doesn't know its own phone number for some reason.  However the
monkey caught a case where it was returning null, which crashed the
Settings -> About Phone -> Status app.

However the javadoc for Phone.getLine1Number() *does* clearly say "May
return null if not available or the SIM is not ready", so the Status app
*should* gracefully handle this.

Now it does.  (We display this case as "Unknown", just like if we get an
empty string.)

FWIW I grepped thru the rest of the code base for other uses of
getLine1Number(), and everybody else *does* handle null gracefully except
for one case in apps/Mms, which I'll open a separate bug about.

Bug: 2520977
Change-Id: I173561f903f116dbdc2b7c32b8011b59a9eb29d7
2010-03-17 23:03:45 -07:00
Jeff Hamilton
f25b3e04db Format the phone number when displaying in the status settings panel.
Change-Id: I12e437696ebfa6ca8dcdc373f1387fd98e451e50
2010-03-15 17:02:40 -05:00
Nick Pelly
d1a04291c5 Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.
2009-10-08 01:03:34 +02:00
Nick Pelly
d63c011225 Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).
2009-08-17 17:09:44 -07:00
John Wang
4c47009172 am ed47f1e4: Fix the NullPointerException in Status Info.
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.
2009-07-30 18:58:55 -07:00
John Wang
ed47f1e497 Fix the NullPointerException in Status Info.
Fix bug 1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.

	modified:   src/com/android/settings/deviceinfo/Status.java
2009-07-30 18:50:36 -07:00
Chouting Zhang
620965ccc5 am 386278a3: CDMA Settings additions
Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
  CDMA Settings additions
2009-06-25 22:06:36 -07:00
Chouting Zhang
386278a338 CDMA Settings additions
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
2009-06-25 22:01:32 -07:00
Wink Saville
402a740f64 am e2a14e35: Update some TODO comments.
Merge commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03'

* commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03':
  Update some TODO comments.
2009-06-01 14:27:01 -07:00
Wink Saville
e2a14e35aa Update some TODO comments. 2009-05-29 14:06:30 -07:00
Android (Google) Code Review
76dce58435 am 81807831: Merge change 1582 into donut
Merge commit '818078310759e3fbd227c578e20a54e935b1b92a'

* commit '818078310759e3fbd227c578e20a54e935b1b92a':
  Teleca 2b changes.
2009-05-18 23:56:38 -07:00
Wink Saville
ead6928894 Teleca 2b changes. 2009-05-15 14:08:46 -07:00
Michael Chan
8762093e00 Findbug fixes in Settings app
modified:   src/com/android/settings/ApnPreference.java
	modified:   src/com/android/settings/ApnSettings.java
	modified:   src/com/android/settings/BandMode.java
	modified:   src/com/android/settings/BatteryInfo.java
	modified:   src/com/android/settings/LanguageSettings.java
	modified:   src/com/android/settings/ManageApplications.java
	modified:   src/com/android/settings/RadioInfo.java
	modified:   src/com/android/settings/SdCardSettings.java
	modified:   src/com/android/settings/UsageStats.java
	modified:   src/com/android/settings/ZoneList.java
	modified:   src/com/android/settings/bluetooth/LocalBluetoothDevice.java
	modified:   src/com/android/settings/deviceinfo/Status.java
	modified:   src/com/android/settings/quicklaunch/QuickLaunchSettings.java
	modified:   src/com/android/settings/wifi/AccessPointDialog.java
	modified:   src/com/android/settings/wifi/AccessPointPreference.java
	modified:   src/com/android/settings/wifi/WifiLayer.java
	modified:   src/com/android/settings/wifi/WifiSettings.java
2009-05-14 17:47:02 -07:00
Wink Saville
c38866843e AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:56 -07:00
Wink Saville
f9e024198d AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
Evan Millar
5990cc129c Automated import from //branches/master/...@142436,142436 2009-03-24 22:50:12 -07:00
Evan Millar
83368552d1 Automated import from //branches/donutburger/...@142431,142431 2009-03-24 22:42:51 -07:00
Mike Ritter
d166402fc3 Automated import from //branches/donutburger/...@141180,141180 2009-03-24 19:44:13 -07:00
Mike Ritter
18f3afb9cd Automated import from //branches/master/...@141186,141186 2009-03-24 19:43:56 -07:00
The Android Open Source Project
72ed6feab2 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:25 -07:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
4772968987 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:36 -08:00
The Android Open Source Project
1feaa85791 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:05 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00