OSDN Git Service
Amith Yamasani [Wed, 23 Mar 2011 23:03:34 +0000 (16:03 -0700)]
am
ce0976cc: am
2ba97451: am
f3b325f5: Debug feature for HDCP compliance testing.
* commit '
ce0976cccd8a283689b15e33ce2cfaf819620bf6':
Debug feature for HDCP compliance testing.
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:36:15 +0000 (19:36 -0700)]
am
d6f9c32b: am
e2d30184: am
6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
* commit '
d6f9c32b5691d62c157a30e295211114d401a8d9':
Fix ANR with bypass proxy regex
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:06:29 +0000 (14:06 -0700)]
am
a02d1a8a: (-s ours) am
3b9fa42b: am
36f7f4a7: Import revised translations. DO NOT MERGE
* commit '
a02d1a8a90908bbe04186d8f15af2ae4cd9381ec':
Import revised translations. DO NOT MERGE
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 [Sat, 19 Mar 2011 00:05:14 +0000 (17:05 -0700)]
am
5ea56365: (-s ours) am
9567622d: (-s ours) am
c4eeeb29: Import revised translations. DO NOT MERGE
* commit '
5ea56365c5d3f731194e7eb88726968dfa53a4f0':
Import revised translations. DO NOT MERGE
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
Dianne Hackborn [Fri, 18 Mar 2011 19:29:41 +0000 (12:29 -0700)]
Update to follow API change.
Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509
Eric Fischer [Fri, 18 Mar 2011 00:30:25 +0000 (17:30 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 17 Mar 2011 23:55:36 +0000 (16:55 -0700)]
Import revised translations.
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
TK MUN [Thu, 17 Mar 2011 23:31:22 +0000 (16:31 -0700)]
am
8c1d9468: (-s ours) am
8c2a02de: (-s ours) am
e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"
* commit '
8c1d9468ee63734365184d5d7517df54ba6e4cb1':
DO NOT MERGE Do not allow shortcut for "4G Settings"
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:37:09 +0000 (13:37 -0700)]
am
bb8af31f: (-s ours) am
1a04c21b: am
7f050e2e: Import revised translations. DO NOT MERGE
* commit '
bb8af31f860a4546dbb6503325f2bd25ea4a7de9':
Import revised translations. DO NOT MERGE
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:12:09 +0000 (17:12 -0700)]
am
43f36859: (-s ours) am
dd68cde8: am
24d61952: Import revised translations. DO NOT MERGE
* commit '
43f3685910399716ffea76a91e6116a6ce37b3dc':
Import revised translations. DO NOT MERGE
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 18:00:30 +0000 (11:00 -0700)]
am
79c42480: (-s ours) am
d1a2e38a: am
d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
79c424805d5710994795797033cdfe901f5e7292':
Import revised translations. DO NOT MERGE
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:50:31 +0000 (23:50 -0700)]
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
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:34:02 +0000 (23:34 -0700)]
am
a92c00e9: (-s ours) am
69720655: am
9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
a92c00e995ae63e938961cecac9984e48bf781e6':
Import revised translations. DO NOT MERGE
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:26:48 +0000 (23:26 -0700)]
am
4835f31c: (-s ours) am
dbb44b20: Import revised translations. DO NOT MERGE
* commit '
4835f31c7b73ec75525f8108ba510bbae2997a84':
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:44:14 +0000 (21:44 -0700)]
am
4a1f3569: am
85d1f883: am
b24dfbcc: Merge "bug:
3514023 fix string formatting" into honeycomb-mr1
* commit '
4a1f356928207333513595487240efe2be302c7e':
bug:
3514023 fix string formatting
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
Dianne Hackborn [Wed, 16 Mar 2011 00:25:29 +0000 (17:25 -0700)]
Merge "Whoops forgot to add this file."
Dianne Hackborn [Wed, 16 Mar 2011 00:24:29 +0000 (17:24 -0700)]
Whoops forgot to add this file.
Change-Id: Ic040d02e6985bff8c2ee4afea133ff865d252b79
Amith Yamasani [Wed, 16 Mar 2011 00:17:53 +0000 (17:17 -0700)]
Merge "Fix possible NPE when Screen settings is launched quickly in succession."
Dianne Hackborn [Tue, 15 Mar 2011 23:52:50 +0000 (16:52 -0700)]
Merge "Fix to launch sub-preference activities."
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
Gilles Debunne [Tue, 15 Mar 2011 23:24:36 +0000 (16:24 -0700)]
Merge "Unused assets removed from Settings"
Dianne Hackborn [Tue, 15 Mar 2011 23:23:55 +0000 (16:23 -0700)]
Fix to launch sub-preference activities.
Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
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
Gilles Debunne [Tue, 15 Mar 2011 21:33:49 +0000 (14:33 -0700)]
Unused assets removed from Settings
preview moved from drawable to drawable-mdpi
Change-Id: Id58d2cf38d52483057960b7ef176acf61e84dba3
Jason parks [Tue, 15 Mar 2011 20:49:24 +0000 (13:49 -0700)]
am
0b9c7ed1: am
8693ba5c: am
e481eaf9: Remove logging of the password.
* commit '
0b9c7ed10fdc0fd7e697e737404b5c00f9d35666':
Remove logging of the password.
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
Eric Fischer [Tue, 15 Mar 2011 18:57:50 +0000 (11:57 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 15 Mar 2011 17:46:16 +0000 (10:46 -0700)]
Import revised translations.
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
Mike Lockwood [Tue, 15 Mar 2011 00:53:45 +0000 (17:53 -0700)]
am
d205bfe3: (-s ours) am
61487da6: (-s ours) am
e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
d205bfe361c1de857e8013d6acd36f3f831eb979':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
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 22:18:37 +0000 (15:18 -0700)]
am
e88b157a: (-s ours) am
7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE
* commit '
e88b157a8289802d2b862ae3f0e0adad04921a98':
Import revised translations. DO NOT MERGE
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
Irfan Sheriff [Sat, 12 Mar 2011 01:31:05 +0000 (17:31 -0800)]
Merge "Fix numeric strings to not be translated"
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>
Irfan Sheriff [Fri, 11 Mar 2011 23:42:09 +0000 (15:42 -0800)]
Fix numeric strings to not be translated
Bug:
4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
Amith Yamasani [Fri, 11 Mar 2011 00:49:45 +0000 (16:49 -0800)]
Fix possible NPE when Screen settings is launched quickly in succession.
Bug:
3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
Daisuke Miyakawa [Fri, 11 Mar 2011 20:12:06 +0000 (12:12 -0800)]
Stop using Switch.
Bug:
4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
Eric Fischer [Thu, 10 Mar 2011 22:49:18 +0000 (14:49 -0800)]
am
33c5915c: (-s ours) am
91d0b304: Import revised translations. DO NOT MERGE
* commit '
33c5915cb6a02c0dad294d3055cdfb78a8b64244':
Import revised translations. DO NOT MERGE
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:53:55 +0000 (13:53 -0800)]
am
52d769a7: (-s ours) am
5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
52d769a7c30ee9bb884436a1ced0ef5c71812f70':
Import revised translations. DO NOT MERGE
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:17:01 +0000 (23:17 -0800)]
am
63cc3b92: (-s ours) am
f018bd8c: (-s ours) am
36469186: DO NOT MERGE WiMAX settings menu
* commit '
63cc3b92f98758116613a5984ecd4aa65d050bbe':
DO NOT MERGE WiMAX settings menu
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:47:44 +0000 (19:47 -0800)]
am
90222cf6: am
f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
* commit '
90222cf6a8adbd5ae5be74c91a13a63f183a001e':
Improve Bluetooth tethering UI usability.
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:49:23 +0000 (15:49 -0800)]
am
615e0576: am
e924ecb6: Merge "Fix
3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1
* commit '
615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
Fix
3510307: Hide PIN passwords in ConfirmLockPassword
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:49:02 +0000 (10:49 -0800)]
am
788062fe: am
2715376c: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
788062fe82b1f9b51a7670da6400ebabf54da4ca':
IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
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
OSDN Git Service
