Glenn Kasten
b72f1b0f45
am 858fd9a0: HDCP debugging in setting app part 2 of 2
...
* commit '858fd9a0302c6d34781133137a048a9bf668632a':
HDCP debugging in setting app part 2 of 2
2011-04-11 12:43:22 -07:00
Glenn Kasten
858fd9a030
HDCP debugging in setting app part 2 of 2
...
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
2011-04-11 11:11:56 -07:00
Jake Hamby
e9fdee0ed0
am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
...
* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
2011-03-29 13:31:54 -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
ae3ccfd07e
Fix ANR with bypass proxy regex
...
Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1
2011-03-22 17:57:44 -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
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
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
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
Jaikumar Ganesh
37bf3353d1
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
2011-03-08 18:04:25 -08:00
Dianne Hackborn
314dfa7a44
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
2011-03-08 14:53:03 -08:00
Dianne Hackborn
18859947ea
Merge "Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
2011-03-08 14:51:03 -08:00
Dianne Hackborn
c442e52dca
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
2011-03-08 14:40:25 -08:00
Amith Yamasani
cb84ad529d
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".
2011-03-08 13:51:52 -08:00
Amith Yamasani
1ad4824d84
am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15
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
2011-03-08 12:03:13 -08:00
Hung-ying Tyan
0da4ec4981
am f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1
...
* commit 'f8a3a17c1e8cb71342b63cc08388883dedeb3180':
Don't check states when mActiveProfile is present
2011-03-08 07:38:55 -08:00
Hung-ying Tyan
68bcab8532
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
2011-03-06 01:53:45 +08:00
Dianne Hackborn
b26cca371c
am 3f1d3919: Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1
...
* commit '3f1d39193ed6bb0a7553555ac0ebeafed75f03af':
Cherry-pick from master: Fix issue #3324032 :
2011-03-04 18:30:45 -08:00
Dianne Hackborn
3f1d39193e
Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1
2011-03-04 18:28:48 -08:00
Dianne Hackborn
e2e7cf650d
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
2011-03-04 17:34:13 -08:00
Jaikumar Ganesh
18de874e9d
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.
2011-03-04 16:45:39 -08:00
Jaikumar Ganesh
6eb84ac6de
Settings app: Run Bluetooth Event receiver when not in fg.
...
Also fix connection indication issues.
Fixes bugs 3510336 and 3513352
Change-Id: Iaa47c9d7fd04fa5dd2700f55993ba2fd1a78fd70
2011-03-04 14:53:44 -08:00
Lorenzo Colitti
67c70267d1
resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp
...
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
2011-03-04 14:49:40 -08:00
Jaikumar Ganesh
04bebd9800
Merge "Fix settings app not showing correct profile connection state message." into honeycomb-mr1
2011-03-04 11:06:39 -08:00
Jaikumar Ganesh
50e0b0cf87
Fix settings app not showing correct profile connection state message.
...
Bug:3385085
Change-Id: Ie4b7eb6bc9d8c91264cf7f68d7830c110e34496d
2011-03-04 10:27:31 -08:00
Lorenzo Colitti
a4fb8c8684
am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread
...
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
Support configuring the protocol in APN settings.
2011-03-03 17:07:39 -08:00
Lorenzo Colitti
f4393101f8
Merge "Support configuring the protocol in APN settings." into gingerbread
2011-03-03 17:03:45 -08:00
Daisuke Miyakawa
3a695a124e
Not receive tick event in datetime setup
...
DO NOT MERGE
Bug: 3510551
Change-Id: If3d7175fe90b8927099e804fa5fbb37c207fd529
2011-03-03 16:35:22 -08:00
Irfan Sheriff
5640ccff74
Avoid dialog dismiss until IP and proxy is valid
...
Accepting an invalid configuration can lead to
unexpected behavior.
Validate all fields before dismissing dialog. A further
improvement to this can be highlighting the faulty field
to the user by a color change.
Bug: 3462049
Change-Id: I0d0a6eae1d62b16fbb822261c4536c4108a5866d
2011-03-03 15:04:23 -08:00
Irfan Sheriff
00615cf5dc
DO NOT MERGE Proxy and IP fixes
...
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields
Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
2011-03-03 15:01:07 -08:00
Amith Yamasani
fb6f306a2b
am 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
...
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
Bring back Wi-Fi sleep policy setting for wifi-only devices.
2011-03-02 22:16:41 -08:00
Daisuke Miyakawa
96f05f909e
fix datetime setup problem. DO NOT MERGE
...
- remove bat if clause for xl
- use HOUR_OF_DAY instead of HOUR
Bug: 3487947
Change-Id: I532bdb72f62ecbc776411496dd96e72d9c16b997
2011-03-02 20:08:48 -08:00
Svetoslav Ganov
dded90c67e
Merge "Adding system wide long press timeout configurability under accessibility."
2011-03-02 19:17:30 -08:00
Daisuke Miyakawa
027d610205
Merge "Notify "skip to caller."
2011-03-02 18:25:53 -08:00
Daisuke Miyakawa
e0d9ed4a31
Merge "fix datetime setup problem"
2011-03-02 18:13:46 -08:00