Jake Hamby
81cb6be834
Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
2011-03-29 13:28:48 -07:00
Eric Fischer
388fc081bc
am 3b4b91d4
: Import revised translations. DO NOT MERGE
...
* commit '3b4b91d43de5be5f920b7ed931c942817970e336':
Import revised translations. DO NOT MERGE
2011-03-29 12:19:35 -07:00
Eric Fischer
3b4b91d43d
Import revised translations. DO NOT MERGE
...
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
2011-03-29 12:00:36 -07:00
Jake Hamby
f1139aab80
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
...
Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.
Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0
2011-03-28 20:25:23 -07:00
Amith Yamasani
2ba9745180
am f3b325f5
: Debug feature for HDCP compliance testing.
...
* commit 'f3b325f54dadb482d73111ab17cf6a51784de11a':
Debug feature for HDCP compliance testing.
2011-03-23 15:47:40 -07:00
Amith Yamasani
f3b325f54d
Debug feature for HDCP compliance testing.
...
Bug: 4149811
Add a setting in Application->Development to change HDCP checking.
Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
2011-03-23 14:39:43 -07:00
Irfan Sheriff
e2d3018428
am 6864195a
: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
...
* commit '6864195aa0195831a0cfbe92cd37f76c09df43b8':
Fix ANR with bypass proxy regex
2011-03-22 19:33:16 -07:00
Irfan Sheriff
6864195aa0
Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
2011-03-22 19:30:22 -07:00
Irfan Sheriff
ae3ccfd07e
Fix ANR with bypass proxy regex
...
Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1
2011-03-22 17:57:44 -07:00
Eric Fischer
3b9fa42b6b
am 36f7f4a7
: Import revised translations. DO NOT MERGE
...
* commit '36f7f4a773b19121850699ca5b617fe3a1c6bd16':
Import revised translations. DO NOT MERGE
2011-03-22 14:01:54 -07:00
Eric Fischer
36f7f4a773
Import revised translations. DO NOT MERGE
...
Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b
2011-03-22 13:39:43 -07:00
Eric Fischer
1a04c21b5a
am 7f050e2e
: Import revised translations. DO NOT MERGE
...
* commit '7f050e2ef8e1593d8a89f9d3357015c5eb1b8764':
Import revised translations. DO NOT MERGE
2011-03-17 13:32:23 -07:00
Eric Fischer
7f050e2ef8
Import revised translations. DO NOT MERGE
...
Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14
2011-03-17 13:13:20 -07:00
Eric Fischer
dd68cde8fe
am 24d61952
: Import revised translations. DO NOT MERGE
...
* commit '24d6195266848c20cb0e2b0a737b9c2871f68346':
Import revised translations. DO NOT MERGE
2011-03-16 17:08:19 -07:00
Eric Fischer
24d6195266
Import revised translations. DO NOT MERGE
...
Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927
2011-03-16 17:01:59 -07:00
Eric Fischer
d1a2e38ae2
am d2f68160
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'd2f68160437d1e84cd6d320fbad3e84e8955099a':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:39 -07:00
Eric Fischer
d2f6816043
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:21:43 -07:00
Eric Fischer
ef32822861
Import revised translations. DO NOT MERGE
...
Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612
2011-03-16 10:14:34 -07:00
Justin Ho
dce7719cb8
am dc4f7ac4
: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
...
* commit 'dc4f7ac40112f1cace8bb335d12b8164752527d5':
Flip the icon states for Bluetooth profile auto-connect settings
2011-03-15 23:44:05 -07:00
Eric Fischer
69720655fd
am 9a81c122
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '9a81c12275501ec7d2163c63a177bacd51938e18':
Import revised translations. DO NOT MERGE
2011-03-15 23:28:53 -07:00
Eric Fischer
dbb44b2025
Import revised translations. DO NOT MERGE
...
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
2011-03-15 23:14:16 -07:00
Vasu Nori
85d1f88315
am b24dfbcc
: Merge "bug:3514023 fix string formatting" into honeycomb-mr1
...
* commit 'b24dfbcc35842d5b6ed1f7d23348bada08ae0445':
bug:3514023 fix string formatting
2011-03-15 21:37:37 -07:00
Justin Ho
dc4f7ac401
Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
2011-03-15 16:46:49 -07:00
Amith Yamasani
f502eaba0a
Flip the icon states for Bluetooth profile auto-connect settings
...
Bug: 4109035
Change-Id: Idb37a583957eeb8ea4c0b804e7933fd8e9af98e3
2011-03-15 15:14:48 -07:00
Eric Fischer
9a81c12275
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:58:35 -07:00
Eric Fischer
74a8594ee9
Import revised translations. DO NOT MERGE
...
Change-Id: I4889db13857a44d69b095e8004c407edad9e6756
2011-03-15 14:49:02 -07:00
Vasu Nori
b24dfbcc35
Merge "bug:3514023 fix string formatting" into honeycomb-mr1
2011-03-15 14:47:32 -07:00
Vasu Nori
75e17aa8cc
bug:3514023 fix string formatting
...
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
2011-03-15 14:44:50 -07:00
Jason parks
8693ba5cdc
am e481eaf9
: Remove logging of the password.
...
* commit 'e481eaf9618c435ea340a8312ecf8ca8093c7a76':
Remove logging of the password.
2011-03-15 13:44:47 -07:00
Jason parks
e481eaf961
Remove logging of the password.
...
Change-Id: I2b3595089be8fc1d8c197dfa1ef8783c9dd2cf40
2011-03-15 15:24:16 -05:00
Eric Fischer
e88b157a82
am 7d3d72ba
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '7d3d72ba46a33f2b0ea3da880986858663535ed1':
Import revised translations. DO NOT MERGE
2011-03-14 14:28:55 -07:00
Eric Fischer
7d3d72ba46
Import revised translations. DO NOT MERGE
...
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
2011-03-14 14:07:45 -07:00
Eric Fischer
33c5915cb6
am 91d0b304
: Import revised translations. DO NOT MERGE
...
* commit '91d0b3046171117164c9400f9f45f12d4c0a69c7':
Import revised translations. DO NOT MERGE
2011-03-10 14:47:54 -08:00
Eric Fischer
91d0b30461
Import revised translations. DO NOT MERGE
...
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
2011-03-10 14:26:33 -08:00
Eric Fischer
52d769a7c3
am 5ce140c1
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '5ce140c13520e3adca370b3474ebf0c83c097bd1':
Import revised translations. DO NOT MERGE
2011-03-10 13:46:21 -08:00
Eric Fischer
5ce140c135
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:40:28 -08:00
Eric Fischer
0198a30b6f
Import revised translations. DO NOT MERGE
...
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
2011-03-10 11:27:50 -08:00
TK MUN
63cc3b92f9
am f018bd8c
: (-s ours) am 36469186
: DO NOT MERGE WiMAX settings menu
...
* commit 'f018bd8cf3c27cf6ee8dc41c673e9d91b005c8a3':
DO NOT MERGE WiMAX settings menu
2011-03-09 23:14:51 -08:00
TK MUN
f018bd8cf3
am 36469186
: DO NOT MERGE WiMAX settings menu
...
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
DO NOT MERGE WiMAX settings menu
2011-03-09 23:11:59 -08: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
Jake Hamby
90222cf6a8
am f3448d1b
: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
...
* commit 'f3448d1bfda817ccb28996d3dcf5cf8791ece6ce':
Improve Bluetooth tethering UI usability.
2011-03-09 19:45:54 -08:00
Jake Hamby
f3448d1bfd
Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
2011-03-09 19:43:38 -08:00
Jim Miller
615e05761c
am e924ecb6
: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
...
* commit 'e924ecb6114b24d326e8a9c5f4a12179e7f5c5c2':
Fix 3510307: Hide PIN passwords in ConfirmLockPassword
2011-03-09 15:46:18 -08:00
Jim Miller
e924ecb611
Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
2011-03-09 15:44:23 -08:00
Jim Miller
025269df25
Fix 3510307: Hide PIN passwords in ConfirmLockPassword
...
Change-Id: I9389cc37f013fe027df7a0eb0035fc0db8678792
2011-03-09 14:59:10 -08:00
Jake Hamby
c777ee29c8
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
2011-03-09 14:56:56 -08:00
Mike Lockwood
788062fe82
am 2715376c
: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
...
* commit '2715376cfa4d220f183623a5f35214d1bd537376':
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
2011-03-09 10:46:11 -08:00
Mike Lockwood
2715376cfa
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
...
Change-Id: If661a17646e2698e92cfdfb1a3d0e5dd42e06279
BUG: 4061035
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-03-09 12:10:41 -05:00
Jaikumar Ganesh
4d2d004b72
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.
2011-03-08 19:41:50 -08:00
Jaikumar Ganesh
46a2941b3f
Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1
2011-03-08 19:40:12 -08:00