OSDN Git Service
Eric Fischer [Thu, 24 Feb 2011 19:58:22 +0000 (11:58 -0800)]
Import revised translations.
Change-Id: If127a3dcc17eb1ddebf5ef4cb08bb3b1dcfdc418
Eric Fischer [Thu, 24 Feb 2011 19:27:20 +0000 (11:27 -0800)]
am
5826947c: (-s ours) am
73c3d6bc: Import revised translations. DO NOT MERGE
* commit '
5826947c83d615e46303297b356b42f851cc6cdb':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:23:27 +0000 (11:23 -0800)]
am
73c3d6bc: Import revised translations. DO NOT MERGE
* commit '
73c3d6bc24ae0fcdbcc184187b8e3c40514c3f16':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:03:37 +0000 (11:03 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8eb20d2d26afec12263438f7e7d0358139a5d000
Amith Yamasani [Thu, 24 Feb 2011 01:19:11 +0000 (17:19 -0800)]
Remove / re-word some settings for WiFi-only devices.
Bug:
3468248
1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"
Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
Jaikumar Ganesh [Wed, 23 Feb 2011 23:51:04 +0000 (15:51 -0800)]
Merge "Make BluetoothPan implement BluetoothProfile."
Amith Yamasani [Wed, 23 Feb 2011 23:15:02 +0000 (15:15 -0800)]
Merge "Don't change the settings title when editing VPN entries."
Jaikumar Ganesh [Wed, 23 Feb 2011 21:08:09 +0000 (13:08 -0800)]
Make BluetoothPan implement BluetoothProfile.
This makes it consistent across all other profiles.
Change-Id: I4c0694d042d7ed1b78c92ca3be38c8d543886769
Eric Fischer [Wed, 23 Feb 2011 05:36:06 +0000 (21:36 -0800)]
am
3d30b374: (-s ours) am
058f62ba: (-s ours) am
bd044818: Import revised translations. DO NOT MERGE
* commit '
3d30b374f6cedb63d06844f6b2c7fa33f50dd77d':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Tue, 22 Feb 2011 23:56:45 +0000 (15:56 -0800)]
Use new NetworkUtils.numericToInetAddress.
Fetches an InetAddress without danger of an accidental dns lookup.
Change-Id: Ic0ca48cdd06bbbf6f0fb2cd4ae7832dde451ccae
Amith Yamasani [Tue, 22 Feb 2011 22:52:13 +0000 (14:52 -0800)]
Merge "Display -> Screen"
Eric Fischer [Tue, 22 Feb 2011 22:48:35 +0000 (14:48 -0800)]
am
058f62ba: (-s ours) am
bd044818: Import revised translations. DO NOT MERGE
* commit '
058f62baffb28df42cf0419fd06b776170289c71':
Import revised translations. DO NOT MERGE
Amith Yamasani [Tue, 22 Feb 2011 22:44:18 +0000 (14:44 -0800)]
Display -> Screen
Bug:
3337458
Change occurences of Display to Screen.
Change-Id: I39ae963d4797c21a5742e4eb81de743b02cd09c2
Amith Yamasani [Tue, 22 Feb 2011 21:28:32 +0000 (13:28 -0800)]
Don't change the settings title when editing VPN entries.
Bug:
3342918
Change-Id: Ib3a56d3fb644b9b07aeb0b50ec4642714852d6c0
Eric Fischer [Fri, 18 Feb 2011 23:22:41 +0000 (15:22 -0800)]
am
bd044818: Import revised translations. DO NOT MERGE
* commit '
bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Fri, 18 Feb 2011 22:51:23 +0000 (14:51 -0800)]
Update code for making BluetoothInputProfile implement BluetoothProfile.
Change-Id: Ib04abc590429eaa40c0ea1bd24fa728d41306fe8
Wink Saville [Fri, 18 Feb 2011 22:05:39 +0000 (14:05 -0800)]
Merge "Changes for ril.h version 6."
Vasu Nori [Fri, 18 Feb 2011 20:06:41 +0000 (12:06 -0800)]
Merge "display amount of storage on /sdcard by downloads, music etc"
Vasu Nori [Tue, 25 Jan 2011 21:39:16 +0000 (13:39 -0800)]
display amount of storage on /sdcard by downloads, music etc
when music storage usage is clicked on, show music app
when downloads storage usage is clicked on, show download app
when pic/videos storage usage is clicked on, show gallery app
Change-Id: Ia1c341013e550acb537e6f8a4f4558030888cc45
Roy West [Fri, 18 Feb 2011 05:41:46 +0000 (21:41 -0800)]
Fix double-space in string.
Change-Id: I6d1cf8a100ab6c56330f736d4a1582ba95e6d8e1
Roy West [Fri, 18 Feb 2011 05:34:50 +0000 (21:34 -0800)]
Fix bug
3463538.
Change-Id: I29c08eace1ba14f7d5cbad55cffbb2b024f518da
Roy West [Fri, 18 Feb 2011 04:01:07 +0000 (20:01 -0800)]
Fix
3468005.
Change-Id: Idb8ceebbda8025dab13f2c5253d2d04c7eb1b710
Wink Saville [Thu, 17 Feb 2011 20:00:03 +0000 (12:00 -0800)]
Changes for ril.h version 6.
Change-Id: I7e269e5a971c70d6d9a1731b82c538b722cbc01d
Irfan Sheriff [Thu, 17 Feb 2011 19:50:03 +0000 (11:50 -0800)]
Merge "Add support for WPA for soft Ap"
Eric Fischer [Thu, 17 Feb 2011 18:20:39 +0000 (10:20 -0800)]
Import revised translations.
Change-Id: I51cf9d94cd14e67e56a86e669a92e1a64eb6540b
Irfan Sheriff [Thu, 17 Feb 2011 06:59:44 +0000 (22:59 -0800)]
Add support for WPA for soft Ap
Bug:
2771935
Change-Id: I2c02b4e686a65e0748f4a4afd27dc49602d6dd98
Eric Fischer [Wed, 16 Feb 2011 18:41:55 +0000 (10:41 -0800)]
am
afdbc0d9: (-s ours) am
2279d3e1: Import revised translations. DO NOT MERGE
* commit '
afdbc0d9ccc6071ffb5d5bb23b80caf15d93fb36':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:37:32 +0000 (10:37 -0800)]
am
2279d3e1: Import revised translations. DO NOT MERGE
* commit '
2279d3e18fce7170fc48710617e2e814db5095fd':
Import revised translations. DO NOT MERGE
Justin Ho [Wed, 16 Feb 2011 18:29:47 +0000 (10:29 -0800)]
Merge "Updated encryption droid and settings launcher icon"
Eric Fischer [Wed, 16 Feb 2011 18:22:47 +0000 (10:22 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
Amith Yamasani [Wed, 16 Feb 2011 18:14:10 +0000 (10:14 -0800)]
Merge "Fix for crash in TetherSettings when monkey is running."
satok [Wed, 16 Feb 2011 09:27:27 +0000 (18:27 +0900)]
Fix a bug which can't enable mutiple non-preinstalled IMEs at a time
Bug:
3459430
Change-Id: Ieee340a92862047135a03c131517b927e1ed2f5e
Jake Hamby [Tue, 15 Feb 2011 23:50:19 +0000 (15:50 -0800)]
Merge "Bluetooth PAN icon"
Daisuke Miyakawa [Tue, 15 Feb 2011 23:37:53 +0000 (15:37 -0800)]
Merge "Remove padding between top divider and wifi list"
Jim Miller [Tue, 15 Feb 2011 23:04:00 +0000 (15:04 -0800)]
Merge "Fix
3409373: Don't grey out Cancel button on confirm pattern screen"
Jim Miller [Tue, 15 Feb 2011 22:33:47 +0000 (14:33 -0800)]
Merge "Fix
3384928: Update "disabled" strings for lock methods"
Daisuke Miyakawa [Thu, 10 Feb 2011 19:54:06 +0000 (11:54 -0800)]
Remove padding between top divider and wifi list
We need View in addtion to ProgressBar, since the latter doesn't
allow us to control its padding on the bottom.
Bug:
3443287
Change-Id: I1f8fb8eca11d52d9c18866301553110c2147b3ef
Justin Ho [Tue, 15 Feb 2011 15:26:35 +0000 (07:26 -0800)]
Updated encryption droid and settings launcher icon
Change-Id: I550a65d7567dbb139e440acd3d0f32d0cce4c9fc
Jim Miller [Tue, 15 Feb 2011 03:35:18 +0000 (19:35 -0800)]
Merge "Fix
3361307: Disable activity transition in pattern tutorial"
Jim Miller [Tue, 15 Feb 2011 02:41:29 +0000 (18:41 -0800)]
Fix
3384928: Update "disabled" strings for lock methods
This updates the disabled strings to give the user an idea
why the given methods are disabled. It's either because
the DevicePolicyAdmin disabled it ("administrator") or
because the device is encrypted.
Change-Id: I0e99742a838037d069f686ed98f9622754bafe13
Jim Miller [Tue, 15 Feb 2011 02:23:44 +0000 (18:23 -0800)]
Merge "Fix
3444669: Fix message string for max password length"
Jim Miller [Tue, 15 Feb 2011 01:25:01 +0000 (17:25 -0800)]
Fix
3444669: Fix message string for max password length
Change-Id: I5828dc0127b0296d87bdc0c9e251fd9c9a92bd0d
Justin Ho [Tue, 15 Feb 2011 01:45:13 +0000 (17:45 -0800)]
Bluetooth PAN icon
Change-Id: I284cf136e7d6954768770d0a3f50e9a6c7070ae1
Jim Miller [Tue, 15 Feb 2011 01:43:02 +0000 (17:43 -0800)]
Fix
3361307: Disable activity transition in pattern tutorial
This disables the transition animation that happens between
the pattern tutorial and the pattern entry screen. This only
happens the first time the pattern is ever selected.
Change-Id: Iee0ffc84a672da4d559e047ef84aca8d6ab0937f
Eric Fischer [Tue, 15 Feb 2011 01:25:07 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
Jim Miller [Tue, 15 Feb 2011 01:07:22 +0000 (17:07 -0800)]
Fix
3409373: Don't grey out Cancel button on confirm pattern screen
Change-Id: I5832fd92cb71c91239326b295c36d207286263f2
Dianne Hackborn [Mon, 14 Feb 2011 22:57:47 +0000 (14:57 -0800)]
Fix issue #
3405731: Manage applications app names don't update with locale
Change-Id: Ia7dcf7973bde6785afb5978ee2a7858bc6740582
Amith Yamasani [Mon, 14 Feb 2011 22:19:08 +0000 (14:19 -0800)]
Fix for crash in TetherSettings when monkey is running.
Bug:
3407666
onCreateView can get called on returning from another fragment. Moved the
relevant code to onCreate().
Change-Id: Icf08c18a3981051cce4eca2d07334d0a9f3c0116
Robert Greenwalt [Fri, 11 Feb 2011 19:38:51 +0000 (11:38 -0800)]
Merge "Use the new LinkProperties gateways."
Amith Yamasani [Fri, 11 Feb 2011 19:09:06 +0000 (11:09 -0800)]
am
5dd5aff8: (-s ours) am
255fa0e9: (-s ours) am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
5dd5aff80a81aa2d1114054bd50a98f58ca80bde':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Amith Yamasani [Fri, 11 Feb 2011 19:06:23 +0000 (11:06 -0800)]
am
255fa0e9: (-s ours) am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
255fa0e96298da0f2ad1788fb79dfc353c8fc60a':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Amith Yamasani [Fri, 11 Feb 2011 19:03:56 +0000 (11:03 -0800)]
am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
aae04e43ec277c095e181933976dfa7bfd044288':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Robert Greenwalt [Wed, 9 Feb 2011 22:12:38 +0000 (14:12 -0800)]
Use the new LinkProperties gateways.
Changed from singular gateway InetAddress to plural.
bug:
3438810
Change-Id: I07dff8b7dd620a444b5ba2e4f7a87c76a0736fdb
Amith Yamasani [Fri, 11 Feb 2011 01:19:11 +0000 (17:19 -0800)]
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Bug:
3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
Irfan Sheriff [Thu, 10 Feb 2011 22:56:52 +0000 (14:56 -0800)]
Merge "Re-enable wifi proxy UI"
Eric Fischer [Thu, 10 Feb 2011 21:56:23 +0000 (13:56 -0800)]
am
551a9876: (-s ours) am
d422079a: (-s ours) am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
551a9876af8cb6fbdaababf292001d4a23dcd6c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Feb 2011 21:51:31 +0000 (13:51 -0800)]
am
d422079a: (-s ours) am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
d422079aebadd598fe2b3f603b982978a615e11e':
Import revised translations. DO NOT MERGE
Jason parks [Thu, 10 Feb 2011 21:19:20 +0000 (13:19 -0800)]
Merge "There can only be one............................."
Jason parks [Thu, 10 Feb 2011 20:03:47 +0000 (14:03 -0600)]
There can only be one.............................
KEYBOARD!
Bug:
3413847
Change-Id: I3d427f449c6cdbad0770f087d1139dc94be50e80
Daisuke Miyakawa [Thu, 10 Feb 2011 20:26:26 +0000 (12:26 -0800)]
Remove portrait support in SetupWizard
We support sensorLandscape for a moment.
See also I45e30c652feab1d30c4f0379379f8ca4e455fa02
- Use sensorLandscape instead of default
- Modify paddings in default xmls to layout landscape stuffs
correctly
Change-Id: Ife03de69e4d1d2d898cd0e8de3cefd733aea8f19
Irfan Sheriff [Wed, 9 Feb 2011 23:26:25 +0000 (15:26 -0800)]
Re-enable wifi proxy UI
- Add text to warn users about support
- Move proxy above IP settings based on UI recommendations
Bug:
3328410
Change-Id: I3b5aafd32b16adfcd2fadb572ebb2694afdeccbb
Daisuke Miyakawa [Thu, 10 Feb 2011 01:03:07 +0000 (17:03 -0800)]
Forget network on back in SetupWizard
Bug:
3435571
Change-Id: I13c5024515942948971fbf3bb209360244ee7254
Daisuke Miyakawa [Wed, 9 Feb 2011 20:48:49 +0000 (12:48 -0800)]
Merge "Clean up XL Wifi setup and fix misc problems."
Daisuke Miyakawa [Fri, 4 Feb 2011 18:36:46 +0000 (10:36 -0800)]
Clean up XL Wifi setup and fix misc problems.
- Introduce screen state, which suppress inconsistent
UI shown in
3378805.
- Introduce initSecurityFields(), which will reduce hook
inside WifiConfigController#showSecurityfields()
- fix layout for eap-not-supported case with "add network"
flow.
Bug:
3378805
Bug:
3403168
Change-Id: I52895570809095d9baceac5f84665572188ecefd
Eric Fischer [Wed, 9 Feb 2011 18:52:07 +0000 (10:52 -0800)]
am
2cf42dfb: (-s ours) am
c5d5334e: Import revised translations. DO NOT MERGE
* commit '
2cf42dfb2aa8b91495f4e3c61a5a5da08af9cadd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:47:27 +0000 (10:47 -0800)]
am
c5d5334e: Import revised translations. DO NOT MERGE
* commit '
c5d5334e9c55e17c4df98af444c814569b3a77c5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 02:03:05 +0000 (18:03 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
Eric Fischer [Wed, 9 Feb 2011 01:33:14 +0000 (17:33 -0800)]
am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:50:23 +0000 (10:50 -0800)]
am
f0c435c6: (-s ours) am
805b5add: Import revised translations. DO NOT MERGE
* commit '
f0c435c6c8485b6a60e79803ba4ba1b2e5a975bb':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:45:36 +0000 (10:45 -0800)]
am
805b5add: Import revised translations. DO NOT MERGE
* commit '
805b5add435d2c639363d239cf9abf32cd5a1fdd':
Import revised translations. DO NOT MERGE
Alon Albert [Tue, 8 Feb 2011 18:14:01 +0000 (10:14 -0800)]
Merge "Use main looper to post start animation commands This is a workaround till we find a better solution. Posting start() on mail looper will make sure the animation starts but animation can stop randomly when the list gets refreshed which happens for example any time the user interacts with the list by check/uncheking boxes. This is because the list rebuilds itself and views gets detached/attached which binds to a new view."
Alon Albert [Tue, 8 Feb 2011 18:13:35 +0000 (10:13 -0800)]
Merge "Remove Gmail Permissions"
Alon Albert [Sat, 22 Jan 2011 00:45:04 +0000 (16:45 -0800)]
Remove Gmail Permissions
Bug:
3377724
Change-Id: I6e17e7a70bce840b180e40031fc3af25b2b8fdb1
Alon Albert [Mon, 7 Feb 2011 20:33:49 +0000 (12:33 -0800)]
Use main looper to post start animation commands
This is a workaround till we find a better solution. Posting start() on mail
looper will make sure the animation starts but animation can stop randomly
when the list gets refreshed which happens for example any time the user
interacts with the list by check/uncheking boxes. This is because the list
rebuilds itself and views gets detached/attached which binds to a new view.
The long term solution is to switch to the new animator framework but for now
posting on main looper will be consistent with GB behavior.
Bug:
3426585
Change-Id: I77f15873bb47ad05113dc914a5d3d6d8af27e2e8
Eric Fischer [Tue, 8 Feb 2011 01:30:01 +0000 (17:30 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
Jake Hamby [Mon, 7 Feb 2011 21:49:54 +0000 (13:49 -0800)]
am
93d419a2: am
47cb1753: (-s ours) am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
93d419a290696611fa5e2bc644adf0847dfb627a':
Fixed a memory leak in the bluetooth settings
Eric Fischer [Mon, 7 Feb 2011 21:38:01 +0000 (13:38 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
Jim Miller [Mon, 7 Feb 2011 19:40:24 +0000 (11:40 -0800)]
am
1d8c91fa: am
78713aed: Fix
3419077: implement new volume control in Settings.
* commit '
1d8c91faa715a8695ec8c7c03cbe028b07a76070':
Fix
3419077: implement new volume control in Settings.
Justin Ho [Mon, 7 Feb 2011 18:56:56 +0000 (10:56 -0800)]
am
683d8a21: am
a9d8046c: Updated icons in settings
* commit '
683d8a21371f6781718542b62ab185533aae170f':
Updated icons in settings
Daisuke Miyakawa [Tue, 1 Feb 2011 22:39:17 +0000 (14:39 -0800)]
Enable orientation in SetupWizard
Change-Id: I45e30c652feab1d30c4f0379379f8ca4e455fa02
Lorenzo Colitti [Sat, 5 Feb 2011 01:52:16 +0000 (17:52 -0800)]
Merge "Support configuring the protocol in APN settings."
Jake Hamby [Sat, 5 Feb 2011 01:49:01 +0000 (17:49 -0800)]
am
47cb1753: (-s ours) am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
47cb175396c8b020eded62d6c2293b777f20932b':
Fixed a memory leak in the bluetooth settings
Jake Hamby [Sat, 5 Feb 2011 00:20:15 +0000 (16:20 -0800)]
am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
1798fc049eda5f6fd14be3a369eebe81c851abd2':
Fixed a memory leak in the bluetooth settings
Jake Hamby [Sat, 5 Feb 2011 00:12:54 +0000 (16:12 -0800)]
Merge "Fixed a memory leak in the bluetooth settings"
Lorenzo Colitti [Wed, 29 Dec 2010 23:52:41 +0000 (15:52 -0800)]
Support configuring the protocol in APN settings.
Change-Id: I435061a631bdb2f58935af607abf8cd7c5d252ba
satok [Fri, 4 Feb 2011 03:34:35 +0000 (19:34 -0800)]
Merge "Do not reset IME Subtype in InputMethodConfig fragment"
satok [Thu, 3 Feb 2011 13:27:27 +0000 (22:27 +0900)]
Do not reset IME Subtype in InputMethodConfig fragment
Bug:
3415292
Change-Id: Ic9a27982402c6bfd747960d32cce13f3856545da
Jim Miller [Fri, 4 Feb 2011 02:42:11 +0000 (18:42 -0800)]
am
78713aed: Fix
3419077: implement new volume control in Settings.
* commit '
78713aed9e23fbf2f89edae87b2ba9e1387104ff':
Fix
3419077: implement new volume control in Settings.
Jim Miller [Thu, 3 Feb 2011 07:29:03 +0000 (23:29 -0800)]
Fix
3419077: implement new volume control in Settings.
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
Daisuke Miyakawa [Fri, 4 Feb 2011 02:18:31 +0000 (18:18 -0800)]
Remove unnecessary flag.
Bug:
3415073
Change-Id: I01d8c958a495bd7d9376304de1098b473b56a091
Justin Ho [Thu, 3 Feb 2011 23:33:45 +0000 (15:33 -0800)]
am
a9d8046c: Updated icons in settings
* commit '
a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
Updated icons in settings
Justin Ho [Thu, 3 Feb 2011 22:49:24 +0000 (14:49 -0800)]
Updated icons in settings
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
Wink Saville [Wed, 2 Feb 2011 21:25:05 +0000 (13:25 -0800)]
am
ec4045fa: am
327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '
ec4045faba607270c4d29b5016f0156fdd6a7eb4':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
Wink Saville [Wed, 2 Feb 2011 21:20:06 +0000 (13:20 -0800)]
am
327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '
327147eb062a25ecab40d66ea14559070e0ecef3':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
Wink Saville [Wed, 2 Feb 2011 19:30:25 +0000 (11:30 -0800)]
Have SecuritySettings and SoundSettings use getCurrentPhoneType
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.
bug:
3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
Jaikumar Ganesh [Wed, 2 Feb 2011 18:41:32 +0000 (10:41 -0800)]
Merge "Changes for public API of Bluetooth Discoverability."
Jaikumar Ganesh [Wed, 2 Feb 2011 03:58:29 +0000 (19:58 -0800)]
Changes for public API of Bluetooth Discoverability.
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the defaul - 120 secs.
Change-Id: Ife1bc803587ba975bb103a5ba7629d4a382cd705
Andy Stadler [Wed, 2 Feb 2011 02:19:42 +0000 (18:19 -0800)]
am
37033e1a: am
9597406a: Restart encryption display after screen power cycle
* commit '
37033e1a8857b125407350e64ef59b2060955d49':
Restart encryption display after screen power cycle
Andy Stadler [Wed, 2 Feb 2011 02:17:19 +0000 (18:17 -0800)]
am
9597406a: Restart encryption display after screen power cycle
* commit '
9597406aa1b83867b03a47d1a5162969b924f2fc':
Restart encryption display after screen power cycle
Andy Stadler [Wed, 2 Feb 2011 01:35:20 +0000 (17:35 -0800)]
Restart encryption display after screen power cycle
Bug:
3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
OSDN Git Service
