OSDN Git Service
Eric Fischer [Wed, 6 Apr 2011 21:19:10 +0000 (14:19 -0700)]
am
84edd9d5: am
8214c76e: Import revised translations. DO NOT MERGE
* commit '
84edd9d5281cb8e03ea31631aa232b8458136f32':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:16:10 +0000 (14:16 -0700)]
am
8214c76e: Import revised translations. DO NOT MERGE
* commit '
8214c76e27de37a663cf8ce7a30091bf23c9be02':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 20:51:27 +0000 (13:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
Eric Fischer [Tue, 5 Apr 2011 00:42:55 +0000 (17:42 -0700)]
am
dfb78827: (-s ours) am
955ab98f: Import revised translations. DO NOT MERGE
* commit '
dfb78827767e14c8db205d8a7200f3f4025a0831':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 4 Apr 2011 19:21:25 +0000 (12:21 -0700)]
am
955ab98f: Import revised translations. DO NOT MERGE
* commit '
955ab98f030cd198d838bdff8768ff87a17be9a8':
Import revised translations. DO NOT MERGE
Park Sanghyun [Wed, 30 Mar 2011 22:29:48 +0000 (15:29 -0700)]
am
2b2959b3: (-s ours) am
e5da8565: DO NOT MERGE Add support for additional System Update menu item
* commit '
2b2959b32141e86a0de880ded77c3ef63a081e0f':
DO NOT MERGE Add support for additional System Update menu item
Kenny Root [Wed, 30 Mar 2011 16:36:19 +0000 (09:36 -0700)]
resolved conflicts for merge of
70a1ff03 to honeycomb-plus-aosp
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
Park Sanghyun [Wed, 30 Mar 2011 16:31:15 +0000 (09:31 -0700)]
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
Kenny Root [Tue, 29 Mar 2011 22:43:38 +0000 (15:43 -0700)]
am
7fceefa7: Merge "Settings: Improved UX when viewing open source license info."
* commit '
7fceefa79229ece2efab0446841543a8f8f20a1d':
Settings: Improved UX when viewing open source license info.
Kenny Root [Tue, 29 Mar 2011 22:03:25 +0000 (15:03 -0700)]
Merge "Settings: Improved UX when viewing open source license info."
Henrik Carlsson [Fri, 3 Sep 2010 09:08:19 +0000 (11:08 +0200)]
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
Eric Fischer [Tue, 29 Mar 2011 21:19:44 +0000 (14:19 -0700)]
am
573235d9: am
142f4533: am
429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '
573235d9a73efdf3af066e47803a6c24382e6979':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:15:16 +0000 (14:15 -0700)]
am
142f4533: am
429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '
142f453399a123a3f9c046f5cec626b7e7d6facd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:07:12 +0000 (14:07 -0700)]
am
429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '
429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
Import revised translations. DO NOT MERGE
Jake Hamby [Tue, 29 Mar 2011 20:34:20 +0000 (13:34 -0700)]
am
e9fdee0e: am
81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
* commit '
e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
Eric Fischer [Tue, 29 Mar 2011 20:32:59 +0000 (13:32 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669
Jake Hamby [Tue, 29 Mar 2011 20:31:54 +0000 (13:31 -0700)]
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.
Jake Hamby [Tue, 29 Mar 2011 20:28:48 +0000 (13:28 -0700)]
Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 19:24:35 +0000 (12:24 -0700)]
am
388fc081: am
3b4b91d4: Import revised translations. DO NOT MERGE
* commit '
388fc081bcca23525fa5a7cea58b8d4ae794d69c':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:19:35 +0000 (12:19 -0700)]
am
3b4b91d4: Import revised translations. DO NOT MERGE
* commit '
3b4b91d43de5be5f920b7ed931c942817970e336':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:00:36 +0000 (12:00 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
Eric Fischer [Tue, 29 Mar 2011 17:58:24 +0000 (10:58 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
Jake Hamby [Tue, 29 Mar 2011 03:25:23 +0000 (20:25 -0700)]
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
Park Sanghyun [Fri, 25 Mar 2011 07:23:59 +0000 (16:23 +0900)]
DO NOT MERGE Add support for additional System Update menu item
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
Amith Yamasani [Wed, 23 Mar 2011 22:53:22 +0000 (15:53 -0700)]
am
2ba97451: am
f3b325f5: Debug feature for HDCP compliance testing.
* commit '
2ba9745180b2bb3400d0e1376552902d1b27c89a':
Debug feature for HDCP compliance testing.
Amith Yamasani [Wed, 23 Mar 2011 22:47:40 +0000 (15:47 -0700)]
am
f3b325f5: Debug feature for HDCP compliance testing.
* commit '
f3b325f54dadb482d73111ab17cf6a51784de11a':
Debug feature for HDCP compliance testing.
Amith Yamasani [Wed, 23 Mar 2011 19:49:20 +0000 (12:49 -0700)]
Debug feature for HDCP compliance testing.
Bug:
4149811
Add a setting in Application->Development to change HDCP checking.
Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
Irfan Sheriff [Wed, 23 Mar 2011 02:34:46 +0000 (19:34 -0700)]
am
e2d30184: am
6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
* commit '
e2d301842807bc7f1ea13672a685e5f83824140f':
Fix ANR with bypass proxy regex
Irfan Sheriff [Wed, 23 Mar 2011 02:33:16 +0000 (19:33 -0700)]
am
6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
* commit '
6864195aa0195831a0cfbe92cd37f76c09df43b8':
Fix ANR with bypass proxy regex
Irfan Sheriff [Wed, 23 Mar 2011 02:30:22 +0000 (19:30 -0700)]
Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
Irfan Sheriff [Wed, 23 Mar 2011 00:19:05 +0000 (17:19 -0700)]
Fix ANR with bypass proxy regex
Bug:
4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1
Eric Fischer [Tue, 22 Mar 2011 21:04:17 +0000 (14:04 -0700)]
am
3b9fa42b: am
36f7f4a7: Import revised translations. DO NOT MERGE
* commit '
3b9fa42b6bfab20022cb5760cf41a3000325bc0c':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 21:01:54 +0000 (14:01 -0700)]
am
36f7f4a7: Import revised translations. DO NOT MERGE
* commit '
36f7f4a773b19121850699ca5b617fe3a1c6bd16':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 20:39:43 +0000 (13:39 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b
Eric Fischer [Fri, 18 Mar 2011 23:58:12 +0000 (16:58 -0700)]
am
9567622d: (-s ours) am
c4eeeb29: Import revised translations. DO NOT MERGE
* commit '
9567622d32e322ce866969c38ba19dfb882752d5':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 23:52:30 +0000 (16:52 -0700)]
am
c4eeeb29: Import revised translations. DO NOT MERGE
* commit '
c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:17:01 +0000 (15:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
TK MUN [Thu, 17 Mar 2011 23:27:29 +0000 (16:27 -0700)]
am
8c2a02de: (-s ours) am
e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"
* commit '
8c2a02defc4139b2532861602d8e2816018f53b9':
DO NOT MERGE Do not allow shortcut for "4G Settings"
TK MUN [Thu, 17 Mar 2011 23:20:42 +0000 (16:20 -0700)]
am
e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"
* commit '
e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
DO NOT MERGE Do not allow shortcut for "4G Settings"
Eric Fischer [Thu, 17 Mar 2011 20:34:44 +0000 (13:34 -0700)]
am
1a04c21b: am
7f050e2e: Import revised translations. DO NOT MERGE
* commit '
1a04c21b5ae872a5be7f533caa80b6bb87e14b0c':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Mar 2011 20:32:23 +0000 (13:32 -0700)]
am
7f050e2e: Import revised translations. DO NOT MERGE
* commit '
7f050e2ef8e1593d8a89f9d3357015c5eb1b8764':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Mar 2011 20:13:20 +0000 (13:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14
TK MUN [Wed, 16 Mar 2011 07:04:54 +0000 (16:04 +0900)]
DO NOT MERGE Do not allow shortcut for "4G Settings"
Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.
Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551
Eric Fischer [Thu, 17 Mar 2011 00:09:45 +0000 (17:09 -0700)]
am
dd68cde8: am
24d61952: Import revised translations. DO NOT MERGE
* commit '
dd68cde8fe7195ec99f973f550dfb2737e9c630d':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Mar 2011 00:08:19 +0000 (17:08 -0700)]
am
24d61952: Import revised translations. DO NOT MERGE
* commit '
24d6195266848c20cb0e2b0a737b9c2871f68346':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Mar 2011 00:01:59 +0000 (17:01 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927
Eric Fischer [Wed, 16 Mar 2011 17:54:24 +0000 (10:54 -0700)]
am
d1a2e38a: am
d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
d1a2e38ae2c8d64b7fadc979ac7a58c138809745':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Mar 2011 17:51:39 +0000 (10:51 -0700)]
am
d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
d2f68160437d1e84cd6d320fbad3e84e8955099a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Mar 2011 17:21:43 +0000 (10:21 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 16 Mar 2011 17:14:34 +0000 (10:14 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612
Justin Ho [Wed, 16 Mar 2011 06:47:11 +0000 (23:47 -0700)]
am
dce7719c: am
dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
* commit '
dce7719cb86104920ce0305bb4f5971dc18374b3':
Flip the icon states for Bluetooth profile auto-connect settings
Justin Ho [Wed, 16 Mar 2011 06:44:05 +0000 (23:44 -0700)]
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
Eric Fischer [Wed, 16 Mar 2011 06:31:53 +0000 (23:31 -0700)]
am
69720655: am
9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
69720655fdbcffeb34deb03e767007cc20a0f525':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Mar 2011 06:28:53 +0000 (23:28 -0700)]
am
9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
9a81c12275501ec7d2163c63a177bacd51938e18':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Mar 2011 06:23:50 +0000 (23:23 -0700)]
am
dbb44b20: Import revised translations. DO NOT MERGE
* commit '
dbb44b2025b680f0df3a0fe049cfb023f7ffab56':
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
Vasu Nori [Wed, 16 Mar 2011 04:42:08 +0000 (21:42 -0700)]
am
85d1f883: am
b24dfbcc: Merge "bug:
3514023 fix string formatting" into honeycomb-mr1
* commit '
85d1f883150129237fd98173ab345acd259bd2b3':
bug:
3514023 fix string formatting
Vasu Nori [Wed, 16 Mar 2011 04:37:37 +0000 (21:37 -0700)]
am
b24dfbcc: Merge "bug:
3514023 fix string formatting" into honeycomb-mr1
* commit '
b24dfbcc35842d5b6ed1f7d23348bada08ae0445':
bug:
3514023 fix string formatting
Justin Ho [Tue, 15 Mar 2011 23:46:49 +0000 (16:46 -0700)]
Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
Amith Yamasani [Tue, 15 Mar 2011 22:14:48 +0000 (15:14 -0700)]
Flip the icon states for Bluetooth profile auto-connect settings
Bug:
4109035
Change-Id: Idb37a583957eeb8ea4c0b804e7933fd8e9af98e3
Eric Fischer [Tue, 15 Mar 2011 21:58:35 +0000 (14:58 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 15 Mar 2011 21:49:02 +0000 (14:49 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4889db13857a44d69b095e8004c407edad9e6756
Vasu Nori [Tue, 15 Mar 2011 21:47:32 +0000 (14:47 -0700)]
Merge "bug:
3514023 fix string formatting" into honeycomb-mr1
Vasu Nori [Tue, 15 Mar 2011 21:39:25 +0000 (14:39 -0700)]
bug:
3514023 fix string formatting
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
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
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 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
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>
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: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: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: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: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: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 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
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
OSDN Git Service
