Commit Graph

2352 Commits

Author SHA1 Message Date
Eric Fischer
2c701570eb Import revised translations.
Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87
2011-04-15 14:41:32 -07:00
Simon Wilson
f927cccd79 am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 14:12:43 -07:00
Simon Wilson
37063d6adf DO NOT MERGE Clarify additional system update string length/usage
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
2011-04-11 12:38:54 -07:00
Eric Fischer
89882974d6 Merge "Import revised translations." 2011-04-07 14:08:01 -07:00
Eric Fischer
c821f6d8f8 Import revised translations.
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
2011-04-07 13:59:28 -07:00
Joe Onorato
4c0c2bea9e advanced settings
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
2011-04-06 18:26:20 -07:00
Eric Fischer
8214c76e27 Import revised translations. DO NOT MERGE
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
2011-04-06 13:51:27 -07:00
Eric Fischer
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
2011-04-04 12:21:25 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE"
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7 DO NOT MERGE Put additional update package names in config.xml
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
2011-04-01 13:59:32 -07:00
Jim Miller
30cf12cc17 Fix LockScreen Settings on phones.
Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
2011-03-30 21:16:48 -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
Eric Fischer
3b4b91d43d Import revised translations. DO NOT MERGE
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
2011-03-29 12:00:36 -07:00
Eric Fischer
955ab98f03 Import revised translations. DO NOT MERGE
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
2011-03-29 10:58:24 -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
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
Eric Fischer
36f7f4a773 Import revised translations. DO NOT MERGE
Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b
2011-03-22 13:39:43 -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
Eric Fischer
88806fa5ae Import revised translations.
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
2011-03-17 16:55:36 -07:00
Eric Fischer
7f050e2ef8 Import revised translations. DO NOT MERGE
Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14
2011-03-17 13:13:20 -07:00
Eric Fischer
24d6195266 Import revised translations. DO NOT MERGE
Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927
2011-03-16 17:01:59 -07:00
Eric Fischer
ef32822861 Import revised translations. DO NOT MERGE
Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612
2011-03-16 10:14:34 -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
Vasu Nori
85d1f88315 am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1
* commit 'b24dfbcc35842d5b6ed1f7d23348bada08ae0445':
  bug:3514023 fix string formatting
2011-03-15 21:37:37 -07:00
Gilles Debunne
e2255e2f18 Merge "Unused assets removed from Settings" 2011-03-15 16:24:36 -07:00
Eric Fischer
9a81c12275 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:58:35 -07:00
Eric Fischer
74a8594ee9 Import revised translations. DO NOT MERGE
Change-Id: I4889db13857a44d69b095e8004c407edad9e6756
2011-03-15 14:49:02 -07:00
Vasu Nori
b24dfbcc35 Merge "bug:3514023 fix string formatting" into honeycomb-mr1 2011-03-15 14:47:32 -07:00
Vasu Nori
75e17aa8cc bug:3514023 fix string formatting
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
2011-03-15 14:44:50 -07:00
Gilles Debunne
c59a3a431c Unused assets removed from Settings
preview moved from drawable to drawable-mdpi

Change-Id: Id58d2cf38d52483057960b7ef176acf61e84dba3
2011-03-15 14:43:51 -07:00
Eric Fischer
d503062723 Import revised translations.
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
2011-03-15 10:46:16 -07:00
Eric Fischer
7d3d72ba46 Import revised translations. DO NOT MERGE
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
2011-03-14 14:07:45 -07:00
Irfan Sheriff
f5fe437842 Merge "Fix numeric strings to not be translated" 2011-03-11 17:31:05 -08:00
Irfan Sheriff
6c7cd3bcba Fix numeric strings to not be translated
Bug: 4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
2011-03-11 15:42:09 -08:00
Daisuke Miyakawa
d4fa73f877 Stop using Switch.
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
2011-03-11 12:14:48 -08:00
Eric Fischer
91d0b30461 Import revised translations. DO NOT MERGE
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
2011-03-10 14:26:33 -08:00
Eric Fischer
5ce140c135 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:40:28 -08:00
Eric Fischer
0198a30b6f Import revised translations. DO NOT MERGE
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
2011-03-10 11:27:50 -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
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