OSDN Git Service
The Android Automerger [Tue, 13 Mar 2012 14:05:18 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Mon, 12 Mar 2012 21:51:05 +0000 (14:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e41f60d64f58cd7b999359e7aea7461c9a40a32
Irfan Sheriff [Mon, 12 Mar 2012 17:38:19 +0000 (10:38 -0700)]
Merge "Increase char limit"
Irfan Sheriff [Mon, 12 Mar 2012 17:13:54 +0000 (10:13 -0700)]
Increase char limit
Bug:
6126418
Change-Id: I1addfec2dd8810028cd0e19c27eff5602358c6b9
The Android Automerger [Mon, 12 Mar 2012 14:05:44 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Sat, 10 Mar 2012 02:33:51 +0000 (18:33 -0800)]
Merge "Save timezone when setting data cycle reset date."
Jeff Sharkey [Sat, 10 Mar 2012 01:11:14 +0000 (17:11 -0800)]
Save timezone when setting data cycle reset date.
Bug:
5938567
Change-Id: I9df8da9d030169952098efc04cfde79e3e42e1f8
Irfan Sheriff [Sat, 10 Mar 2012 00:27:59 +0000 (16:27 -0800)]
Merge "Fix p2p settings NPE"
Irfan Sheriff [Fri, 9 Mar 2012 22:25:37 +0000 (14:25 -0800)]
Fix p2p settings NPE
Bug:
6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
Eric Fischer [Fri, 9 Mar 2012 21:31:11 +0000 (13:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3c88f810d7ef01a594865e8102048c0090dde1f5
Irfan Sheriff [Fri, 9 Mar 2012 09:17:50 +0000 (01:17 -0800)]
Merge "Use a different place holder name for string"
Eric Fischer [Fri, 9 Mar 2012 01:45:43 +0000 (17:45 -0800)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Fri, 9 Mar 2012 00:51:39 +0000 (16:51 -0800)]
Use a different place holder name for string
Bug:
6132597
Change-Id: Ie6bf125413da4c1bcd288ae329e6d0f07200db85
Amith Yamasani [Thu, 8 Mar 2012 19:15:49 +0000 (11:15 -0800)]
Fix NPE due to removed preference.
Bug:
6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
Eric Fischer [Thu, 8 Mar 2012 21:40:33 +0000 (13:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8b363dd496956ef7205b7d22a7ff6a080398d0e3
Amith Yamasani [Thu, 8 Mar 2012 19:15:49 +0000 (11:15 -0800)]
Fix NPE due to removed preference.
Bug:
6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
The Android Automerger [Thu, 8 Mar 2012 15:04:58 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 7 Mar 2012 23:17:40 +0000 (15:17 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 7 Mar 2012 22:09:26 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0a6f821b47bcd8d1a67f6c7436eb79b5bd9b6798
Irfan Sheriff [Wed, 7 Mar 2012 19:22:06 +0000 (11:22 -0800)]
Merge "P2p UI fixes"
Irfan Sheriff [Wed, 7 Mar 2012 18:54:06 +0000 (10:54 -0800)]
P2p UI fixes
- Move Wi-Fi direct as a setting in Wi-Fi
- Handle some UI refresh issues
Change-Id: Idc43a2ca98acc4b904ca1f5fe0b1447ee612f218
The Android Automerger [Wed, 7 Mar 2012 15:03:29 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Irfan Sheriff [Tue, 6 Mar 2012 20:37:49 +0000 (12:37 -0800)]
Merge "Remove dead strings and code"
Irfan Sheriff [Tue, 6 Mar 2012 20:27:44 +0000 (12:27 -0800)]
Remove dead strings and code
Change-Id: Iacd5c1bee978a52b2e534a2c9db5a1b98f5bd48e
Dianne Hackborn [Tue, 6 Mar 2012 18:33:41 +0000 (10:33 -0800)]
Merge "Use a component name that actually exists when enabling/disabling."
The Android Automerger [Tue, 6 Mar 2012 15:04:31 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Dianne Hackborn [Tue, 6 Mar 2012 02:37:54 +0000 (18:37 -0800)]
Use a component name that actually exists when enabling/disabling.
Change-Id: Id6422a0039060bce3dc1bdc39551f04a4e4adbe6
Eric Fischer [Tue, 6 Mar 2012 00:09:48 +0000 (16:09 -0800)]
Also restore a deleted array that is still referenced.
Change-Id: I6b9aecd9dc634eb55c2d256ab9dc9f623ad4feb5
Eric Fischer [Mon, 5 Mar 2012 23:54:04 +0000 (15:54 -0800)]
Restore deleted strings still referenced from resources.
Change-Id: I29b16678900a1056ee6f41e530d68bb308ef27c9
Eric Fischer [Mon, 5 Mar 2012 23:17:09 +0000 (15:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ica141533e5f8c8791b55304152524e4c26fc673b
The Android Automerger [Mon, 5 Mar 2012 15:05:01 +0000 (07:05 -0800)]
merge in jb-release history after reset to master
satok [Mon, 5 Mar 2012 07:06:07 +0000 (16:06 +0900)]
Fix spell checker settings layout
Change-Id: Ida36af8ae4e2ebd74a29d7b941bf718604de3b12
Irfan Sheriff [Sat, 3 Mar 2012 00:33:10 +0000 (16:33 -0800)]
Merge "Enhance and fix WPS UI"
Irfan Sheriff [Tue, 28 Feb 2012 00:20:29 +0000 (16:20 -0800)]
Enhance and fix WPS UI
- Fixes WPS usage for open network
- Exposes WPS on UI for easy access to push button and pin based techniques
- Adds support for cancelling WPS
- Adds a dialog that reports a progress since WPS can take quite a bit of time
to complete
The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com
on partner source.
Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca
Eric Fischer [Fri, 2 Mar 2012 22:15:42 +0000 (14:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I784ea3784067393b951c50a50938b9140a36f236
Irfan Sheriff [Fri, 2 Mar 2012 07:57:12 +0000 (23:57 -0800)]
am
f91e52c9: am
c4bf8cd9: am
2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '
f91e52c986f4e7f8094a794c471813ac05d5d59c':
Enable EAP-pwd configuration in WiFi Settings.
Irfan Sheriff [Fri, 2 Mar 2012 06:55:17 +0000 (22:55 -0800)]
am
c4bf8cd9: am
2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '
c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d':
Enable EAP-pwd configuration in WiFi Settings.
Irfan Sheriff [Fri, 2 Mar 2012 06:48:42 +0000 (22:48 -0800)]
am
2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '
2f76aaaf0105add942334ef3574e7378ee8a6097':
Enable EAP-pwd configuration in WiFi Settings.
Irfan Sheriff [Fri, 2 Mar 2012 00:47:19 +0000 (16:47 -0800)]
Merge "Enable EAP-pwd configuration in WiFi Settings."
The Android Open Source Project [Fri, 2 Mar 2012 00:46:23 +0000 (16:46 -0800)]
Irfan Sheriff [Fri, 2 Mar 2012 00:26:58 +0000 (16:26 -0800)]
Merge "Use new WifiManager API"
The Android Open Source Project [Thu, 1 Mar 2012 23:51:22 +0000 (15:51 -0800)]
Irfan Sheriff [Fri, 24 Feb 2012 19:24:13 +0000 (11:24 -0800)]
Use new WifiManager API
Change-Id: I9cc092e98412146a07c1829cacab47b8cea0bc9a
The Android Open Source Project [Thu, 1 Mar 2012 18:43:48 +0000 (10:43 -0800)]
am
b2a0ea35: Reconcile with ics-mr1-release
* commit '
b2a0ea3541191318a8810cef63a2d2b7d9566e4e':
The Android Open Source Project [Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e
The Android Open Source Project [Thu, 1 Mar 2012 18:14:25 +0000 (10:14 -0800)]
am
79ec613a: Reconcile with ics-mr1-release
* commit '
79ec613a66b71a16591bcd3bde5cb815f1a3d352':
The Android Open Source Project [Thu, 1 Mar 2012 18:12:39 +0000 (10:12 -0800)]
Reconcile with ics-mr1-release
Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd
The Android Automerger [Thu, 1 Mar 2012 15:04:13 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Irfan Sheriff [Thu, 1 Mar 2012 03:35:17 +0000 (19:35 -0800)]
Merge "Add support for wifi verification before connect"
Irfan Sheriff [Tue, 14 Feb 2012 17:26:07 +0000 (09:26 -0800)]
Add support for wifi verification before connect
Change-Id: Ie1fb9c2fad4f75985077236eab61c296314f4fe4
Chia-chi Yeh [Thu, 1 Mar 2012 00:12:35 +0000 (16:12 -0800)]
VpnSettings: show more error messages when VPN fails.
Bug:
6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
Chia-chi Yeh [Wed, 29 Feb 2012 23:40:28 +0000 (15:40 -0800)]
VpnSettings: use profiles instead of networks in the context of VPN.
Change-Id: Ic43a7972ccd8abbedc5235b3685451fc36f59eec
The Android Automerger [Wed, 29 Feb 2012 15:04:09 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
The Android Automerger [Tue, 28 Feb 2012 23:15:44 +0000 (15:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 28 Feb 2012 22:00:52 +0000 (14:00 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 28 Feb 2012 21:20:49 +0000 (13:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: If06bc1fe79c024b2c393b0cb36b72763242a96fe
Amith Yamasani [Tue, 28 Feb 2012 18:19:18 +0000 (10:19 -0800)]
am
1d424251: (-s ours) am
9220d367: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
1d42425179607774dcd4c588a2a5b5453c2587ed':
Amith Yamasani [Tue, 28 Feb 2012 18:17:30 +0000 (10:17 -0800)]
am
35fc9c76: (-s ours) am
e5cb62f5: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
35fc9c76e6a341d0c35ae0b003f8dbcb3e61bc03':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 18:16:55 +0000 (10:16 -0800)]
am
9220d367: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9220d367eb30ba8f5375627cd782921b82c8b332':
Amith Yamasani [Tue, 28 Feb 2012 18:15:11 +0000 (10:15 -0800)]
am
e5cb62f5: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
e5cb62f5f4af389f21d950b7847f0df909a0225f':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 18:14:00 +0000 (10:14 -0800)]
am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9372484065993cfdb9a48ddecc52d2ed911e8ce1':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 18:13:28 +0000 (10:13 -0800)]
am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9372484065993cfdb9a48ddecc52d2ed911e8ce1':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 01:09:37 +0000 (17:09 -0800)]
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Bug:
6079494
(cherry picked from commit
5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8)
Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
Amith Yamasani [Tue, 28 Feb 2012 17:34:05 +0000 (09:34 -0800)]
Merge "Don't crash if there's no bluetooth functionality (such as in an emulator)"
The Android Automerger [Tue, 28 Feb 2012 15:03:47 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Amith Yamasani [Tue, 28 Feb 2012 01:09:37 +0000 (17:09 -0800)]
Don't crash if there's no bluetooth functionality (such as in an emulator)
Bug:
6079494
Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
Eric Fischer [Mon, 27 Feb 2012 23:53:10 +0000 (15:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I227e80744e9b0a7fb4a05f42d77592bbf0f33e21
The Android Automerger [Mon, 27 Feb 2012 15:04:32 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Partha N [Wed, 18 Jan 2012 02:33:03 +0000 (18:33 -0800)]
Enable EAP-pwd configuration in WiFi Settings.
EAP-pwd (RFC 5931) is an EAP method that uses a shared password
for authentication. It has the simplicity of setup as WPA2-PSK
(no certificates), but provides strong authenticaiton like 802.1x.
Modified the Settings screen so that the only visible fields
when choosing EAP-pwd are 'identity' and 'password'.
Change-Id: I9365d873b43c416ddfa4cae47b7419d902c212a7
Signed-off-by: Partha N <parthan@gmail.com>
Robert Greenwalt [Fri, 24 Feb 2012 23:00:21 +0000 (15:00 -0800)]
Merge "Use the framework rather than RIL constants"
Jeff Sharkey [Fri, 24 Feb 2012 01:25:33 +0000 (17:25 -0800)]
Merge "Reduce string lengths to fit on narrow screens."
Jeff Sharkey [Fri, 24 Feb 2012 01:24:35 +0000 (17:24 -0800)]
Reduce string lengths to fit on narrow screens.
Bug:
5780676
Change-Id: I841bc6c9a358af9dcf31badf5b3545ad6ec885fe
Eric Fischer [Thu, 23 Feb 2012 22:25:07 +0000 (14:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c4f903d7850328ebc3ea3e89f4b9eb121d9d2cc
The Android Automerger [Thu, 23 Feb 2012 15:03:57 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Daisuke Miyakawa [Thu, 23 Feb 2012 02:35:26 +0000 (18:35 -0800)]
Merge "Remove "Vibrate and ring" option"
Daisuke Miyakawa [Wed, 22 Feb 2012 22:08:43 +0000 (14:08 -0800)]
Remove "Vibrate and ring" option
It will be part of Phone's settings. See Ifb19b53b850ee8a4c15
Bug:
6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
Eric Fischer [Wed, 22 Feb 2012 22:16:48 +0000 (14:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I32958249019d55f0f7301fa5a37879f562b31345
Eric Fischer [Tue, 21 Feb 2012 22:18:22 +0000 (14:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7547b6ad8816a57f6dff7dd61c47bf6525090daf
The Android Automerger [Mon, 20 Feb 2012 15:04:20 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Irfan Sheriff [Sat, 18 Feb 2012 00:05:44 +0000 (16:05 -0800)]
Merge "Fix cursor position for password"
Irfan Sheriff [Sat, 18 Feb 2012 00:04:05 +0000 (16:04 -0800)]
Fix cursor position for password
Bug:
5757292
Change-Id: Iad34b09ee56c24694ebf45350f0dbc398f2cfa06
Eric Fischer [Fri, 17 Feb 2012 23:58:31 +0000 (15:58 -0800)]
Import translations.
Change-Id: I1e023de5eab792b15df68fa6bdffdb0d6118a876
Robert Greenwalt [Fri, 17 Feb 2012 23:25:14 +0000 (15:25 -0800)]
Use the framework rather than RIL constants
bug:
5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
Eric Fischer [Fri, 17 Feb 2012 05:11:25 +0000 (21:11 -0800)]
Merge "Import translations."
Dianne Hackborn [Thu, 16 Feb 2012 23:11:18 +0000 (15:11 -0800)]
Fix issue #
6026576 de_source_broad_Android - GoogleJob [192291 / - ]
-GTT_request character limit extension
Change-Id: Id0ef1c025dca8f8cbd7914f551d897ce9b044763
Eric Fischer [Thu, 16 Feb 2012 22:56:08 +0000 (14:56 -0800)]
Import translations.
Change-Id: I465465b1b620e22dcdcf642e4c12ebee1aff3da7
The Android Open Source Project [Thu, 16 Feb 2012 19:25:36 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:22 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 18:13:50 +0000 (10:13 -0800)]
am
cff569f1: Reconcile with ics-mr1-release
* commit '
cff569f11cb4960ce5299bf6c198eeb7945dc224':
The Android Open Source Project [Thu, 16 Feb 2012 18:11:02 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e
The Android Open Source Project [Thu, 16 Feb 2012 18:06:42 +0000 (10:06 -0800)]
am
7b276302: Reconcile with ics-mr1-release
* commit '
7b2763021750a2d138eaa20ee2d2828d83d1720c':
The Android Open Source Project [Thu, 16 Feb 2012 18:03:02 +0000 (10:03 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235
The Android Automerger [Thu, 16 Feb 2012 15:04:05 +0000 (07:04 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 15 Feb 2012 22:34:26 +0000 (14:34 -0800)]
Import translations.
Change-Id: Ied8b68c4e16a93835b769dc05a38f066d0b43837
The Android Automerger [Wed, 15 Feb 2012 15:03:41 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 15 Feb 2012 00:08:03 +0000 (16:08 -0800)]
Merge "Import translations."
Eric Fischer [Wed, 15 Feb 2012 00:00:20 +0000 (16:00 -0800)]
Import translations.
Change-Id: I998fa1d4ddeec81d4532143ed5313db39f53bbde
Irfan Sheriff [Tue, 14 Feb 2012 23:39:09 +0000 (15:39 -0800)]
Merge "Concurrency wifi p2p and client operation support"
The Android Automerger [Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 14 Feb 2012 22:07:03 +0000 (14:07 -0800)]
Merge "Add debug app / wait for debugger dev options."
OSDN Git Service
