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
Justin Ho
7002bf0f91
am 346c8a1f: am 6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1
...
* commit '346c8a1f0e86e805770f5d09f41ff9220192fdb3':
Updated storage display colors in Settings
2011-03-08 18:40:20 -08:00
Amith Yamasani
cb6a9bc307
am cb84ad52: am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit 'cb84ad529d802e60931d94b68912ee85c9758952':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 18:39:59 -08:00
Eric Fischer
4652c45e6b
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-08 15:52:49 -08:00
Eric Fischer
f819668bf4
Import revised translations. DO NOT MERGE
...
Change-Id: Iec33108aec25759701f47de6fa95d8d9657ff95e
2011-03-08 15:43:10 -08:00
Justin Ho
6adc2ee87f
Merge "Updated storage display colors in Settings" into honeycomb-mr1
2011-03-08 14:11:40 -08:00
Justin Ho
bfbe8a07ce
Updated storage display colors in Settings
...
Bug: 3321005
Change-Id: Ia6b254d758beeb755703f5e9c86854079841c59b
2011-03-08 13:57:28 -08:00
Amith Yamasani
1ad4824d84
am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15
Wifi disconnect policy summary text should not contain "mobile data".
...
Bug: 4026299
Change the summary if it is a wifi-only device.
Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
2011-03-08 12:03:13 -08:00
Daisuke Miyakawa
6eb9979910
Use consistent indent
...
Not all indents but just relevant ones are fixed.
Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
2011-03-07 19:26:06 -08:00
Daisuke Miyakawa
f82efaedce
Fix layout for wifi setup xl
...
- use 56dip instead of 48dip for TableRow's height
- enclose some Views to accomodate them well
in TableRow
- use center_vertical instead of bottom to show
TextView. Bottom texts looks weird with wider height.
Change-Id: I9c544cb4f2532e8ceb84a746fc22223ca1dce58c
2011-03-07 17:58:01 -08:00
Eric Fischer
0e1acd4d19
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:06:48 -08:00
Eric Fischer
bf896b047d
Import revised translations. DO NOT MERGE
...
Change-Id: If88ebfce5d7dae236a41644ed9a09b85d1b17157
2011-03-07 12:57:11 -08:00
Vasu Nori
da407be453
am 4943af9f: am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1
...
* commit '4943af9f71f0dc273c05de0d67dc23495748c5c1':
bug:3514023 fix strings
2011-03-07 11:49:53 -08:00
Vasu Nori
71dee16bc9
Merge "bug:3514023 fix strings" into honeycomb-mr1
2011-03-07 11:45:09 -08:00
Vasu Nori
e875c73505
bug:3514023 fix strings
...
Change-Id: I3662b4eeaa4da9df9d007e3e0ad4a3dd59e429c0
2011-03-07 11:14:27 -08:00
Dianne Hackborn
6bb14c7be7
Merge "Add font size preference."
2011-03-04 17:33:19 -08:00
Dianne Hackborn
6677e56f45
Add font size preference.
...
Shamelessly stolen from SpareParts.
Change-Id: I5bcdc5c738a0b2af7e7bd8dae303997c28298086
2011-03-04 17:30:54 -08:00
Eric Fischer
c090623001
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-04 13:53:51 -08:00
Eric Fischer
bc2f61b2e3
Import revised translations. DO NOT MERGE
...
Change-Id: I76e25be51258b5f5f7ea1b919b1280c326741953
2011-03-04 13:47:23 -08:00
Daisuke Miyakawa
f26b2b5110
Fix padding problem around progress bar
...
Change-Id: I3f76b4f01ed433e68a839f02c2c1840c60749ef1
2011-03-04 13:08:44 -08:00
Daisuke Miyakawa
834f4363cf
am d85ce3c9: Put SSID field first.
...
* commit 'd85ce3c9eacdf3a0b201a7756e8b423f32328584':
Put SSID field first.
2011-03-04 11:37:55 -08:00
Eric Fischer
89a2fc69f8
am e39213e2: Merge changes I33bf228d,I18d2329e into honeycomb-mr1
...
* commit 'e39213e2253adfc621c3d7ed1a2ffdd8e1702c10':
Remove unneeded large-screen-specific translations.
Mark placeholders in format strings as placeholders.
2011-03-04 01:00:11 -08:00
Daisuke Miyakawa
d85ce3c9ea
Put SSID field first.
...
Bug: 3508455
Change-Id: I1626562d235947cd662a3eb9579f93b6ebc6ab56
2011-03-03 20:08:09 -08:00
Svetoslav Ganov
8802b5c67f
am c82b60dc: Updated the strings for configuring long press timeout.
...
* commit 'c82b60dcc766d4c189838f77c351b066c25c5f89':
Updated the strings for configuring long press timeout.
2011-03-03 17:25:02 -08:00
Lorenzo Colitti
a4fb8c8684
am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread
...
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
Support configuring the protocol in APN settings.
2011-03-03 17:07:39 -08:00
Eric Fischer
e39213e225
Merge changes I33bf228d,I18d2329e into honeycomb-mr1
...
* changes:
Remove unneeded large-screen-specific translations.
Mark placeholders in format strings as placeholders.
2011-03-03 16:20:18 -08:00
Eric Fischer
a52f9d5666
Remove unneeded large-screen-specific translations.
...
Change-Id: I33bf228dfa58959db343da5d41be000a2ef58ab0
2011-03-03 15:50:37 -08:00
Eric Fischer
43d495987d
Mark placeholders in format strings as placeholders.
...
Bug: 3422176
Change-Id: I18d2329e72fa9a521c2349fea638e4435f737ca7
2011-03-03 15:17:05 -08:00
Irfan Sheriff
216a58c882
Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
2011-03-03 15:02:05 -08:00
Irfan Sheriff
00615cf5dc
DO NOT MERGE Proxy and IP fixes
...
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields
Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
2011-03-03 15:01:07 -08:00