diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2012-03-28 19:21:45 -0700 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2012-03-29 15:27:55 -0700 |
| commit | 5f12f031111b47500fd6bb9ef0744fd379b31ece (patch) | |
| tree | 691a92d30ee0c2ef84680ccf1b1db9b39b9a63c9 /core | |
| parent | 58a40a3e92f8a53ac1068f0839dec4a1707fa6fb (diff) | |
| download | frameworks_base-5f12f031111b47500fd6bb9ef0744fd379b31ece.zip frameworks_base-5f12f031111b47500fd6bb9ef0744fd379b31ece.tar.gz frameworks_base-5f12f031111b47500fd6bb9ef0744fd379b31ece.tar.bz2 | |
Move TelephonyCapabilities from Phone to telephony
- Move the class.
- Remove some TODOs mentioning this action : the class should belong to
telephony layer instead of to the Phone package
- Add private strings used in the class
Bug: 6252254
Change-Id: I0d4ca2f8e4d775004d146fe6f9c60165a94366a9
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 9c5f4d6..7b4f50b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -850,6 +850,8 @@ <java-symbol type="string" name="wifi_watchdog_network_disabled" /> <java-symbol type="string" name="wifi_watchdog_network_disabled_detailed" /> <java-symbol type="string" name="yesterday" /> + <java-symbol type="string" name="imei" /> + <java-symbol type="string" name="meid" /> <java-symbol type="plurals" name="abbrev_in_num_days" /> <java-symbol type="plurals" name="abbrev_in_num_hours" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7799f74..6c9576f 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -97,6 +97,12 @@ the SIM card. --> <string name="needPuk">Your SIM card is PUK-locked. Type the PUK code to unlock it.</string> <string name="needPuk2">Type PUK2 to unblock SIM card.</string> + <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] --> + <string name="imei">IMEI</string> + + <!-- Title for the dialog used to display the user's MEID number on CDMA network + [CHAR LIMIT=10] --> + <string name="meid">MEID</string> <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. --> <string name="ClipMmi">Incoming Caller ID</string> |