OSDN Git Service
Dianne Hackborn [Wed, 16 Mar 2011 00:25:29 +0000 (17:25 -0700)]
Merge "Whoops forgot to add this file."
Dianne Hackborn [Wed, 16 Mar 2011 00:24:29 +0000 (17:24 -0700)]
Whoops forgot to add this file.
Change-Id: Ic040d02e6985bff8c2ee4afea133ff865d252b79
Amith Yamasani [Wed, 16 Mar 2011 00:17:53 +0000 (17:17 -0700)]
Merge "Fix possible NPE when Screen settings is launched quickly in succession."
Dianne Hackborn [Tue, 15 Mar 2011 23:52:50 +0000 (16:52 -0700)]
Merge "Fix to launch sub-preference activities."
Gilles Debunne [Tue, 15 Mar 2011 23:24:36 +0000 (16:24 -0700)]
Merge "Unused assets removed from Settings"
Dianne Hackborn [Tue, 15 Mar 2011 23:23:55 +0000 (16:23 -0700)]
Fix to launch sub-preference activities.
Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
Gilles Debunne [Tue, 15 Mar 2011 21:33:49 +0000 (14:33 -0700)]
Unused assets removed from Settings
preview moved from drawable to drawable-mdpi
Change-Id: Id58d2cf38d52483057960b7ef176acf61e84dba3
Jason parks [Tue, 15 Mar 2011 20:49:24 +0000 (13:49 -0700)]
am
0b9c7ed1: am
8693ba5c: am
e481eaf9: Remove logging of the password.
* commit '
0b9c7ed10fdc0fd7e697e737404b5c00f9d35666':
Remove logging of the password.
Jason parks [Tue, 15 Mar 2011 20:47:36 +0000 (13:47 -0700)]
am
8693ba5c: am
e481eaf9: Remove logging of the password.
* commit '
8693ba5cdc219929078710bbeac7d7a7d94088b3':
Remove logging of the password.
Jason parks [Tue, 15 Mar 2011 20:44:47 +0000 (13:44 -0700)]
am
e481eaf9: Remove logging of the password.
* commit '
e481eaf9618c435ea340a8312ecf8ca8093c7a76':
Remove logging of the password.
Jason parks [Tue, 15 Mar 2011 20:24:16 +0000 (15:24 -0500)]
Remove logging of the password.
Change-Id: I2b3595089be8fc1d8c197dfa1ef8783c9dd2cf40
Eric Fischer [Tue, 15 Mar 2011 18:57:50 +0000 (11:57 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 15 Mar 2011 17:46:16 +0000 (10:46 -0700)]
Import revised translations.
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
Mike Lockwood [Tue, 15 Mar 2011 00:53:45 +0000 (17:53 -0700)]
am
d205bfe3: (-s ours) am
61487da6: (-s ours) am
e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
d205bfe361c1de857e8013d6acd36f3f831eb979':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Mike Lockwood [Tue, 15 Mar 2011 00:48:59 +0000 (17:48 -0700)]
am
61487da6: (-s ours) am
e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
61487da6ace3c83c71b164edd307a6ea87f9ff0c':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Eric Fischer [Mon, 14 Mar 2011 22:18:37 +0000 (15:18 -0700)]
am
e88b157a: (-s ours) am
7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE
* commit '
e88b157a8289802d2b862ae3f0e0adad04921a98':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Mar 2011 21:28:55 +0000 (14:28 -0700)]
am
7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE
* commit '
7d3d72ba46a33f2b0ea3da880986858663535ed1':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Mar 2011 21:07:45 +0000 (14:07 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
Mike Lockwood [Mon, 14 Mar 2011 20:34:57 +0000 (13:34 -0700)]
am
e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Irfan Sheriff [Sat, 12 Mar 2011 01:31:05 +0000 (17:31 -0800)]
Merge "Fix numeric strings to not be translated"
Mike Lockwood [Wed, 9 Mar 2011 17:10:41 +0000 (12:10 -0500)]
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Bug:
4061035
Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Irfan Sheriff [Fri, 11 Mar 2011 23:42:09 +0000 (15:42 -0800)]
Fix numeric strings to not be translated
Bug:
4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
Amith Yamasani [Fri, 11 Mar 2011 00:49:45 +0000 (16:49 -0800)]
Fix possible NPE when Screen settings is launched quickly in succession.
Bug:
3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
Daisuke Miyakawa [Fri, 11 Mar 2011 20:12:06 +0000 (12:12 -0800)]
Stop using Switch.
Bug:
4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
Eric Fischer [Thu, 10 Mar 2011 22:49:18 +0000 (14:49 -0800)]
am
33c5915c: (-s ours) am
91d0b304: Import revised translations. DO NOT MERGE
* commit '
33c5915cb6a02c0dad294d3055cdfb78a8b64244':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 22:47:54 +0000 (14:47 -0800)]
am
91d0b304: Import revised translations. DO NOT MERGE
* commit '
91d0b3046171117164c9400f9f45f12d4c0a69c7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 22:26:33 +0000 (14:26 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
Eric Fischer [Thu, 10 Mar 2011 21:53:55 +0000 (13:53 -0800)]
am
52d769a7: (-s ours) am
5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
52d769a7c30ee9bb884436a1ced0ef5c71812f70':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 21:46:21 +0000 (13:46 -0800)]
am
5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
5ce140c13520e3adca370b3474ebf0c83c097bd1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 19:40:28 +0000 (11:40 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Thu, 10 Mar 2011 19:27:50 +0000 (11:27 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
TK MUN [Thu, 10 Mar 2011 07:17:01 +0000 (23:17 -0800)]
am
63cc3b92: (-s ours) am
f018bd8c: (-s ours) am
36469186: DO NOT MERGE WiMAX settings menu
* commit '
63cc3b92f98758116613a5984ecd4aa65d050bbe':
DO NOT MERGE WiMAX settings menu
TK MUN [Thu, 10 Mar 2011 07:14:51 +0000 (23:14 -0800)]
am
f018bd8c: (-s ours) am
36469186: DO NOT MERGE WiMAX settings menu
* commit '
f018bd8cf3c27cf6ee8dc41c673e9d91b005c8a3':
DO NOT MERGE WiMAX settings menu
TK MUN [Thu, 10 Mar 2011 07:11:59 +0000 (23:11 -0800)]
am
36469186: DO NOT MERGE WiMAX settings menu
* commit '
36469186b7459d13688a2ca1c2316dbf172794dd':
DO NOT MERGE WiMAX settings menu
TK MUN [Wed, 23 Feb 2011 09:57:38 +0000 (18:57 +0900)]
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>
Jake Hamby [Thu, 10 Mar 2011 03:47:44 +0000 (19:47 -0800)]
am
90222cf6: am
f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
* commit '
90222cf6a8adbd5ae5be74c91a13a63f183a001e':
Improve Bluetooth tethering UI usability.
Jake Hamby [Thu, 10 Mar 2011 03:45:54 +0000 (19:45 -0800)]
am
f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
* commit '
f3448d1bfda817ccb28996d3dcf5cf8791ece6ce':
Improve Bluetooth tethering UI usability.
Jake Hamby [Thu, 10 Mar 2011 03:43:38 +0000 (19:43 -0800)]
Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
Jim Miller [Wed, 9 Mar 2011 23:49:23 +0000 (15:49 -0800)]
am
615e0576: am
e924ecb6: Merge "Fix
3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
* commit '
615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
Fix
3510307: Hide PIN passwords in ConfirmLockPassword
Jim Miller [Wed, 9 Mar 2011 23:46:18 +0000 (15:46 -0800)]
am
e924ecb6: Merge "Fix
3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
* commit '
e924ecb6114b24d326e8a9c5f4a12179e7f5c5c2':
Fix
3510307: Hide PIN passwords in ConfirmLockPassword
Jim Miller [Wed, 9 Mar 2011 23:44:23 +0000 (15:44 -0800)]
Merge "Fix
3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
Jim Miller [Wed, 9 Mar 2011 22:53:14 +0000 (14:53 -0800)]
Fix
3510307: Hide PIN passwords in ConfirmLockPassword
Change-Id: I9389cc37f013fe027df7a0eb0035fc0db8678792
Jake Hamby [Fri, 4 Mar 2011 23:37:39 +0000 (15:37 -0800)]
Improve Bluetooth tethering UI usability.
- Updated hint text for BT tethering checkbox to
"[Sharing|not sharing] this [tablet|phone]'s mobile data connection".
- Show correct hint text when user enters tethering screen.
- Show correct status after user enables tethering when Bluetooth is off.
When BluetoothPan.setBluetoothTethering(true) is called with BT off,
BluetoothPanProfileHandler will add a broadcast receiver to enable
tethering after BT turns on. This happens too late to show the correct
status when TetherSettings gets the adapter state changed event, so set
a flag (mBluetoothEnableForTether) instead, and call setBluetoothTethering
ourselves after the state changes to ON. Also, clear the flag if the
adapter state changes to OFF or ERROR.
- Show correct status when user enables tethering, then disables Bluetooth,
then returns to the tethering screen. Previously it would show
Bluetooth tethering enabled, even though adapter state was OFF.
- Show the number of connected devices in tethering preference screen.
- Distinguish between PANU and NAP in device profiles screen, and show
appropriate text to clarify the direction of tethering.
- Remove profiles from device profiles list when the device removes the UUID
(e.g. Mac OS X turning NAP on/off) and after a NAP disconnection when the
remote device only supports PANU.
Bug:
3414575
Change-Id: I2c0830876d5b9bddb293e57c4d3ca74f105911b8
Mike Lockwood [Wed, 9 Mar 2011 18:49:02 +0000 (10:49 -0800)]
am
788062fe: am
2715376c: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
788062fe82b1f9b51a7670da6400ebabf54da4ca':
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Mike Lockwood [Wed, 9 Mar 2011 18:46:11 +0000 (10:46 -0800)]
am
2715376c: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
2715376cfa4d220f183623a5f35214d1bd537376':
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Mike Lockwood [Wed, 9 Mar 2011 17:10:41 +0000 (12:10 -0500)]
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Change-Id: If661a17646e2698e92cfdfb1a3d0e5dd42e06279
BUG:
4061035
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Wed, 9 Mar 2011 07:53:37 +0000 (23:53 -0800)]
am
4d2d004b: am
46a2941b: Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1
* commit '
4d2d004b7239cc29e1d8e6c02b483ff781c19f9a':
Return profile state disconnected when not yet bound to service.
Jaikumar Ganesh [Wed, 9 Mar 2011 03:41:50 +0000 (19:41 -0800)]
am
46a2941b: Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1
* commit '
46a2941b3f2e5c38388f3e503a22768ca2d9814a':
Return profile state disconnected when not yet bound to service.
Jaikumar Ganesh [Wed, 9 Mar 2011 03:40:12 +0000 (19:40 -0800)]
Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1
Eric Fischer [Wed, 9 Mar 2011 02:42:30 +0000 (18:42 -0800)]
am
7d549c10: (-s ours) am
4652c45e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
7d549c10b499ecfd5ad44d22953729020cb4297d':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Wed, 9 Mar 2011 02:41:04 +0000 (18:41 -0800)]
am
314dfa7a: am
18859947: Merge "Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
* commit '
314dfa7a440b690a1b400f81a21ab60abb6b1fbb':
Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped
Justin Ho [Wed, 9 Mar 2011 02:40:20 +0000 (18:40 -0800)]
am
346c8a1f: am
6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1
* commit '
346c8a1f0e86e805770f5d09f41ff9220192fdb3':
Updated storage display colors in Settings
Amith Yamasani [Wed, 9 Mar 2011 02:39:59 +0000 (18:39 -0800)]
am
cb84ad52: am
1ad4824d: am
35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit '
cb84ad529d802e60931d94b68912ee85c9758952':
Wifi disconnect policy summary text should not contain "mobile data".
Jaikumar Ganesh [Wed, 9 Mar 2011 02:03:00 +0000 (18:03 -0800)]
Return profile state disconnected when not yet bound to service.
Bug:
4007080
There is a another bug open to handle service object being null
and a connect / disconnect call being made.
Change-Id: I30f6923323532b5756338b350ec4ce0e1a31d1ff
Eric Fischer [Tue, 8 Mar 2011 23:55:20 +0000 (15:55 -0800)]
am
4652c45e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
4652c45e6b8ddf4e335a478e823052696b82011e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Mar 2011 23:52:49 +0000 (15:52 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 8 Mar 2011 23:43:10 +0000 (15:43 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Iec33108aec25759701f47de6fa95d8d9657ff95e
Dianne Hackborn [Tue, 8 Mar 2011 22:53:03 +0000 (14:53 -0800)]
am
18859947: Merge "Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
* commit '
18859947ea2899197e1621e154aab6bceb14d406':
Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped
Dianne Hackborn [Tue, 8 Mar 2011 22:51:03 +0000 (14:51 -0800)]
Merge "Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
Dianne Hackborn [Tue, 8 Mar 2011 22:40:25 +0000 (14:40 -0800)]
Fix issue #
4021524 HMI63B: "Force stop" button not disabled after app is stopped
There should probably be a broadcast from PM about this. Later.
Change-Id: I713197ed458f8f6a914efb3800cd1b192f741613
Justin Ho [Tue, 8 Mar 2011 22:13:36 +0000 (14:13 -0800)]
am
6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1
* commit '
6adc2ee87fd19a2f3d03896b1054facd8a3e8788':
Updated storage display colors in Settings
Justin Ho [Tue, 8 Mar 2011 22:11:40 +0000 (14:11 -0800)]
Merge "Updated storage display colors in Settings" into honeycomb-mr1
Justin Ho [Tue, 8 Mar 2011 21:57:28 +0000 (13:57 -0800)]
Updated storage display colors in Settings
Bug:
3321005
Change-Id: Ia6b254d758beeb755703f5e9c86854079841c59b
Amith Yamasani [Tue, 8 Mar 2011 21:51:52 +0000 (13:51 -0800)]
am
1ad4824d: am
35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit '
1ad4824d848d67e185f06b4fdce86f1caeb0d95e':
Wifi disconnect policy summary text should not contain "mobile data".
Amith Yamasani [Tue, 8 Mar 2011 21:48:26 +0000 (13:48 -0800)]
am
35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit '
35bc6b5f151ea073522f14067eb92aab3a99bc7d':
Wifi disconnect policy summary text should not contain "mobile data".
Amith Yamasani [Tue, 8 Mar 2011 20:03:13 +0000 (12:03 -0800)]
Wifi disconnect policy summary text should not contain "mobile data".
Bug:
4026299
Change the summary if it is a wifi-only device.
Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
Hung-ying Tyan [Tue, 8 Mar 2011 15:55:29 +0000 (07:55 -0800)]
am
0da4ec49: am
f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1
* commit '
0da4ec49813cbad4b27acc7ec56cbfba3a741b76':
Don't check states when mActiveProfile is present
Hung-ying Tyan [Tue, 8 Mar 2011 15:38:55 +0000 (07:38 -0800)]
am
f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1
* commit '
f8a3a17c1e8cb71342b63cc08388883dedeb3180':
Don't check states when mActiveProfile is present
Hung-ying Tyan [Tue, 8 Mar 2011 15:24:13 +0000 (07:24 -0800)]
Merge "Don't check states when mActiveProfile is present" into honeycomb-mr1
Daisuke Miyakawa [Tue, 8 Mar 2011 03:24:01 +0000 (19:24 -0800)]
Use consistent indent
Not all indents but just relevant ones are fixed.
Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
Daisuke Miyakawa [Tue, 8 Mar 2011 03:21:22 +0000 (19:21 -0800)]
Merge "Handle "scanning" status correctly"
Daisuke Miyakawa [Tue, 8 Mar 2011 01:58:01 +0000 (17:58 -0800)]
Fix layout for wifi setup xl
- use 56dip instead of 48dip for TableRow's height
- enclose some Views to accomodate them well
in TableRow
- use center_vertical instead of bottom to show
TextView. Bottom texts looks weird with wider height.
Change-Id: I9c544cb4f2532e8ceb84a746fc22223ca1dce58c
Daisuke Miyakawa [Tue, 8 Mar 2011 00:28:09 +0000 (16:28 -0800)]
Handle "scanning" status correctly
Bug:
4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
Daisuke Miyakawa [Tue, 8 Mar 2011 00:07:43 +0000 (16:07 -0800)]
Merge "Show "disconnected" progress bar on add network flow"
Daisuke Miyakawa [Tue, 8 Mar 2011 00:06:35 +0000 (16:06 -0800)]
Show "disconnected" progress bar on add network flow
Change-Id: I4dc2df9016f21f655a13c244b744020de4a12d0b
Eric Fischer [Mon, 7 Mar 2011 21:24:39 +0000 (13:24 -0800)]
am
bada0585: (-s ours) am
0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
bada05855b26e9e9309460d22e2a48177ecaacd9':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Mar 2011 21:11:50 +0000 (13:11 -0800)]
am
0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
0e1acd4d19f3809acc446b761b74d12f2a88ecfc':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Mar 2011 21:06:48 +0000 (13:06 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Mon, 7 Mar 2011 20:57:11 +0000 (12:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If88ebfce5d7dae236a41644ed9a09b85d1b17157
Vasu Nori [Mon, 7 Mar 2011 19:49:53 +0000 (11:49 -0800)]
am
4943af9f: am
71dee16b: Merge "bug:
3514023 fix strings" into honeycomb-mr1
* commit '
4943af9f71f0dc273c05de0d67dc23495748c5c1':
bug:
3514023 fix strings
Vasu Nori [Mon, 7 Mar 2011 19:46:45 +0000 (11:46 -0800)]
am
71dee16b: Merge "bug:
3514023 fix strings" into honeycomb-mr1
* commit '
71dee16bc9683d1dd768c852e12911c72e471544':
bug:
3514023 fix strings
Vasu Nori [Mon, 7 Mar 2011 19:45:09 +0000 (11:45 -0800)]
Merge "bug:
3514023 fix strings" into honeycomb-mr1
Vasu Nori [Mon, 7 Mar 2011 19:14:27 +0000 (11:14 -0800)]
bug:
3514023 fix strings
Change-Id: I3662b4eeaa4da9df9d007e3e0ad4a3dd59e429c0
Hung-ying Tyan [Sat, 5 Mar 2011 17:53:45 +0000 (01:53 +0800)]
Don't check states when mActiveProfile is present
and is in IDLE state. checkVpnConnectionStatus() will clean up mActiveProfile
if it's IDLE.
Bug:
3513962
Change-Id: I8289fa321fdbd46def9c8207cef79cb45509897a
Dianne Hackborn [Sat, 5 Mar 2011 02:32:59 +0000 (18:32 -0800)]
am
b26cca37: am
3f1d3919: Merge "Cherry-pick from master: Fix issue #
3324032:" into honeycomb-mr1
* commit '
b26cca371c5040ec33b3e3de11914ca9fbc7b933':
Cherry-pick from master: Fix issue #
3324032:
Dianne Hackborn [Sat, 5 Mar 2011 02:30:45 +0000 (18:30 -0800)]
am
3f1d3919: Merge "Cherry-pick from master: Fix issue #
3324032:" into honeycomb-mr1
* commit '
3f1d39193ed6bb0a7553555ac0ebeafed75f03af':
Cherry-pick from master: Fix issue #
3324032:
Dianne Hackborn [Sat, 5 Mar 2011 02:28:48 +0000 (18:28 -0800)]
Merge "Cherry-pick from master: Fix issue #
3324032:" into honeycomb-mr1
Dianne Hackborn [Thu, 3 Mar 2011 06:39:49 +0000 (22:39 -0800)]
Cherry-pick from master: Fix issue #
3324032:
(I forgot to commit this before the MR2 branch was made.)
It is possible to create an app that cannot...
...be uninstalled using device policy managers
Don't allow app switches while we are bringing up the confirmation
dialog. This prevents the app from pushing us out of the intended
settings app flow.
Change-Id: Id670e231ac47346478d22a3f59bb4a44a68ef7b2
Dianne Hackborn [Sat, 5 Mar 2011 01:33:19 +0000 (17:33 -0800)]
Merge "Add font size preference."
Dianne Hackborn [Sat, 5 Mar 2011 01:30:54 +0000 (17:30 -0800)]
Add font size preference.
Shamelessly stolen from SpareParts.
Change-Id: I5bcdc5c738a0b2af7e7bd8dae303997c28298086
Dianne Hackborn [Sat, 5 Mar 2011 01:30:28 +0000 (17:30 -0800)]
Merge "Fix issue #
3324032: It is possible to create an app that cannot..."
Jaikumar Ganesh [Sat, 5 Mar 2011 01:14:55 +0000 (17:14 -0800)]
am
18de874e: am
6ff81797: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
* commit '
18de874e9d4d5cf4df0467687e683704399d7689':
Settings app: Run Bluetooth Event receiver when not in fg.
Ed Heyl [Sat, 5 Mar 2011 01:11:18 +0000 (17:11 -0800)]
am
45170dd6: Merge "resolved conflicts for merge of
a4fb8c86 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
45170dd6bbc2106a837a6f39a6bf6455ea36d9cf':
Support configuring the protocol in APN settings.
Daisuke Miyakawa [Sat, 5 Mar 2011 01:04:20 +0000 (17:04 -0800)]
Merge "Fix padding problem around progress bar"
Jaikumar Ganesh [Sat, 5 Mar 2011 00:45:39 +0000 (16:45 -0800)]
am
6ff81797: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
* commit '
6ff8179731043b04a2c5020ca964563c9510b697':
Settings app: Run Bluetooth Event receiver when not in fg.
Jaikumar Ganesh [Fri, 4 Mar 2011 23:09:12 +0000 (15:09 -0800)]
Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
Ed Heyl [Fri, 4 Mar 2011 23:07:23 +0000 (15:07 -0800)]
Merge "resolved conflicts for merge of
a4fb8c86 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Jaikumar Ganesh [Fri, 4 Mar 2011 21:49:37 +0000 (13:49 -0800)]
Settings app: Run Bluetooth Event receiver when not in fg.
Also fix connection indication issues.
Fixes bugs
3510336 and
3513352
Change-Id: Iaa47c9d7fd04fa5dd2700f55993ba2fd1a78fd70
Lorenzo Colitti [Fri, 4 Mar 2011 22:49:40 +0000 (14:49 -0800)]
resolved conflicts for merge of
a4fb8c86 to honeycomb-plus-aosp
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
Eric Fischer [Fri, 4 Mar 2011 22:01:21 +0000 (14:01 -0800)]
am
c0906230: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
c0906230013ec3788f0013f8b53f9732f866ff69':
Import revised translations. DO NOT MERGE