Eric Fischer
955ab98f03
Import revised translations. DO NOT MERGE
...
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
2011-03-29 10:58:24 -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
ce0976cccd
am 2ba97451
: am f3b325f5
: Debug feature for HDCP compliance testing.
...
* commit '2ba9745180b2bb3400d0e1376552902d1b27c89a':
Debug feature for HDCP compliance testing.
2011-03-23 15:53:22 -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
d6f9c32b56
am e2d30184
: am 6864195a
: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
...
* commit 'e2d301842807bc7f1ea13672a685e5f83824140f':
Fix ANR with bypass proxy regex
2011-03-22 19:34:46 -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
6502687ccc
am a02d1a8a
: (-s ours) am 3b9fa42b
: am 36f7f4a7
: Import revised translations. DO NOT MERGE
...
* commit 'a02d1a8a90908bbe04186d8f15af2ae4cd9381ec':
Import revised translations. DO NOT MERGE
2011-03-22 14:06:29 -07:00
Eric Fischer
a02d1a8a90
am 3b9fa42b
: am 36f7f4a7
: Import revised translations. DO NOT MERGE
...
* commit '3b9fa42b6bfab20022cb5760cf41a3000325bc0c':
Import revised translations. DO NOT MERGE
2011-03-22 14:04:17 -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
aa183b91af
am 5ea56365
: (-s ours) am 9567622d
: (-s ours) am c4eeeb29
: Import revised translations. DO NOT MERGE
...
* commit '5ea56365c5d3f731194e7eb88726968dfa53a4f0':
Import revised translations. DO NOT MERGE
2011-03-18 17:05:14 -07:00
Eric Fischer
5ea56365c5
am 9567622d
: (-s ours) am c4eeeb29
: Import revised translations. DO NOT MERGE
...
* commit '9567622d32e322ce866969c38ba19dfb882752d5':
Import revised translations. DO NOT MERGE
2011-03-18 16:58:12 -07:00
Eric Fischer
9567622d32
am c4eeeb29
: Import revised translations. DO NOT MERGE
...
* commit 'c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
Import revised translations. DO NOT MERGE
2011-03-18 16:52:30 -07:00
Eric Fischer
c4eeeb29c5
Import revised translations. DO NOT MERGE
...
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
2011-03-18 15:17:01 -07:00
Dianne Hackborn
48147dca83
Update to follow API change.
...
Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509
2011-03-18 12:29:41 -07:00
Eric Fischer
6a01acdeaf
Merge "Import revised translations."
2011-03-17 17:30:25 -07:00
Eric Fischer
88806fa5ae
Import revised translations.
...
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
2011-03-17 16:55:36 -07:00
TK MUN
9e2ffffb97
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"
2011-03-17 16:31:22 -07:00
TK MUN
8c1d9468ee
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"
2011-03-17 16:27:29 -07:00
TK MUN
8c2a02defc
am e0e845fe
: DO NOT MERGE Do not allow shortcut for "4G Settings"
...
* commit 'e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
DO NOT MERGE Do not allow shortcut for "4G Settings"
2011-03-17 16:20:42 -07:00
Eric Fischer
517dda2bd7
am bb8af31f
: (-s ours) am 1a04c21b
: am 7f050e2e
: Import revised translations. DO NOT MERGE
...
* commit 'bb8af31f860a4546dbb6503325f2bd25ea4a7de9':
Import revised translations. DO NOT MERGE
2011-03-17 13:37:09 -07:00
Eric Fischer
bb8af31f86
am 1a04c21b
: am 7f050e2e
: Import revised translations. DO NOT MERGE
...
* commit '1a04c21b5ae872a5be7f533caa80b6bb87e14b0c':
Import revised translations. DO NOT MERGE
2011-03-17 13:34:44 -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
TK MUN
e0e845fee6
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
2011-03-16 18:10:28 -07:00
Eric Fischer
b755002696
am 43f36859
: (-s ours) am dd68cde8
: am 24d61952
: Import revised translations. DO NOT MERGE
...
* commit '43f3685910399716ffea76a91e6116a6ce37b3dc':
Import revised translations. DO NOT MERGE
2011-03-16 17:12:09 -07:00
Eric Fischer
43f3685910
am dd68cde8
: am 24d61952
: Import revised translations. DO NOT MERGE
...
* commit 'dd68cde8fe7195ec99f973f550dfb2737e9c630d':
Import revised translations. DO NOT MERGE
2011-03-16 17:09:45 -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
54cf703526
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
2011-03-16 11:00:30 -07:00
Eric Fischer
79c424805d
am d1a2e38a
: am d2f68160
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'd1a2e38ae2c8d64b7fadc979ac7a58c138809745':
Import revised translations. DO NOT MERGE
2011-03-16 10:54:24 -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
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
7f9f83fc89
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
2011-03-15 23:47:11 -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
048c07ae25
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
2011-03-15 23:34:02 -07:00
Eric Fischer
a92c00e995
am 69720655
: am 9a81c122
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '69720655fdbcffeb34deb03e767007cc20a0f525':
Import revised translations. DO NOT MERGE
2011-03-15 23:31:53 -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
f18535a9d1
am 4835f31c
: (-s ours) am dbb44b20
: Import revised translations. DO NOT MERGE
...
* commit '4835f31c7b73ec75525f8108ba510bbae2997a84':
Import revised translations. DO NOT MERGE
2011-03-15 23:26:48 -07:00
Eric Fischer
4835f31c7b
am dbb44b20
: Import revised translations. DO NOT MERGE
...
* commit 'dbb44b2025b680f0df3a0fe049cfb023f7ffab56':
Import revised translations. DO NOT MERGE
2011-03-15 23:23:50 -07:00
Eric Fischer
dbb44b2025
Import revised translations. DO NOT MERGE
...
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
2011-03-15 23:14:16 -07:00
Vasu Nori
78252114b4
am 4a1f3569
: am 85d1f883
: am b24dfbcc
: Merge "bug:3514023 fix string formatting" into honeycomb-mr1
...
* commit '4a1f356928207333513595487240efe2be302c7e':
bug:3514023 fix string formatting
2011-03-15 21:44:14 -07:00