Joe Onorato
4c0c2bea9e
advanced settings
...
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
2011-04-06 18:26:20 -07:00
Kenny Root
5b12490abf
am 42f178d1
: resolved conflicts for merge of 70a1ff03
to honeycomb-plus-aosp
...
* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
Settings: Improved UX when viewing open source license info.
2011-03-30 16:38:52 -07:00
Kenny Root
42f178d10b
resolved conflicts for merge of 70a1ff03
to honeycomb-plus-aosp
...
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
2011-03-30 09:36:40 -07:00
Park Sanghyun
2b2959b321
am e5da8565
: DO NOT MERGE Add support for additional System Update menu item
...
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
DO NOT MERGE Add support for additional System Update menu item
2011-03-30 09:31:15 -07:00
Kenny Root
70a1ff0357
am 7fceefa7
: Merge "Settings: Improved UX when viewing open source license info."
...
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
Settings: Improved UX when viewing open source license info.
2011-03-29 15:43:38 -07:00
Henrik Carlsson
2cb19ab9e2
Settings: Improved UX when viewing open source license info.
...
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.
Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
2011-03-29 15:02:44 -07:00
Jake Hamby
c4d9d80906
am 823a6ee9
: am e9fdee0e
: am 81cb6be8
: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
...
* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
2011-03-29 13:36:41 -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
Park Sanghyun
e5da8565ca
DO NOT MERGE Add support for additional System Update menu item
...
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
2011-03-25 19:18:01 -07:00
Amith Yamasani
1dd8c92ccc
am ce0976cc
: am 2ba97451
: am f3b325f5
: Debug feature for HDCP compliance testing.
...
* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
Debug feature for HDCP compliance testing.
2011-03-23 16:03:34 -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
d69210326d
am d6f9c32b
: am e2d30184
: am 6864195a
: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
...
* commit 'd6f9c32b5691d62c157a30e295211114d401a8d9':
Fix ANR with bypass proxy regex
2011-03-22 19:36:15 -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
Dianne Hackborn
48147dca83
Update to follow API change.
...
Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509
2011-03-18 12:29:41 -07:00
Justin Ho
06fd4b0681
am 7f9f83fc
: am dce7719c
: am dc4f7ac4
: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
...
* commit '7f9f83fc894f46cc55cc1927e33160d3492382bb':
Flip the icon states for Bluetooth profile auto-connect settings
2011-03-15 23:50:31 -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
Dianne Hackborn
3f5a9b3c4a
Merge "Whoops forgot to add this file."
2011-03-15 17:25:29 -07:00
Dianne Hackborn
a9d11a8593
Whoops forgot to add this file.
...
Change-Id: Ic040d02e6985bff8c2ee4afea133ff865d252b79
2011-03-15 17:24:29 -07:00
Amith Yamasani
ef84d1edd8
Merge "Fix possible NPE when Screen settings is launched quickly in succession."
2011-03-15 17:17:53 -07:00
Dianne Hackborn
b9db2c372e
Merge "Fix to launch sub-preference activities."
2011-03-15 16:52:50 -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
Dianne Hackborn
b7258186de
Fix to launch sub-preference activities.
...
Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
2011-03-15 16:23:55 -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
eeaa242a34
am 0b9c7ed1
: am 8693ba5c
: am e481eaf9
: Remove logging of the password.
...
* commit '0b9c7ed10fdc0fd7e697e737404b5c00f9d35666':
Remove logging of the password.
2011-03-15 13:49:24 -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
Mike Lockwood
61487da6ac
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
2011-03-14 13:34:57 -07:00
Mike Lockwood
e6c7e45fdb
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 >
2011-03-11 19:19:27 -05:00
Amith Yamasani
be606d6d0e
Fix possible NPE when Screen settings is launched quickly in succession.
...
Bug: 3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
2011-03-11 13:55:29 -08:00
Daisuke Miyakawa
d4fa73f877
Stop using Switch.
...
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
2011-03-11 12:14:48 -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
9fbaf432bd
am 90222cf6
: am f3448d1b
: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
...
* commit '90222cf6a8adbd5ae5be74c91a13a63f183a001e':
Improve Bluetooth tethering UI usability.
2011-03-09 19:47:44 -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
5451db4c4e
am 615e0576
: am e924ecb6
: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
...
* commit '615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
Fix 3510307: Hide PIN passwords in ConfirmLockPassword
2011-03-09 15:49:23 -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
025247c768
am 788062fe
: am 2715376c
: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
...
* commit '788062fe82b1f9b51a7670da6400ebabf54da4ca':
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
2011-03-09 10:49:02 -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
fabb187c22
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.
2011-03-08 23:53:37 -08: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
Dianne Hackborn
b168e97847
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
2011-03-08 18:41:04 -08:00