Eric Fischer
ec40b31c8e
am 88764d6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '88764d6a928065b85f9377cab7ab388604dce12c':
Import revised translations. DO NOT MERGE
2011-03-01 14:44:28 -08:00
Eric Fischer
88764d6a92
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-03-01 14:39:27 -08:00
Eric Fischer
bd9cbae9a9
Import revised translations. DO NOT MERGE
...
Change-Id: I0bd5001ed8ffef60126d98b070ee03355b61e9a9
2011-03-01 14:25:55 -08:00
Amith Yamasani
38d3353e37
am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb
...
* commit '03e90322db140139b19739fbe826494daa900773':
Remove more entries not relevant to wifi-only devices.
2011-03-01 13:33:49 -08:00
Amith Yamasani
03e90322db
Merge "Remove more entries not relevant to wifi-only devices." into honeycomb
2011-03-01 13:27:08 -08:00
Amith Yamasani
c06d4c48a9
Remove more entries not relevant to wifi-only devices.
...
Bug: 3488384
Bug: 3487976
Bug: 3488381
Removed Cell standby entry from Battery use screen.
Removed Mobile signal strength from BatteryHistory screen.
Added wifi IP address to About->Status
Remove auto-timezone checkbox in Settings->Date & time
Change-Id: I228721a3613b1aeb600026e42274337886552698
2011-03-01 12:03:24 -08:00
Eric Fischer
84b23881e6
am 3dd76cfd: Import revised translations. DO NOT MERGE
...
* commit '3dd76cfd844d33b5d6f3a450c6f1c0767ceed851':
Import revised translations. DO NOT MERGE
2011-02-28 14:11:44 -08:00
Eric Fischer
3dd76cfd84
Import revised translations. DO NOT MERGE
...
Change-Id: I70ba332f5ad245551020bc785baea90aa6d0d447
2011-02-28 14:00:02 -08:00
Robert Greenwalt
ca5cc0152f
am 29ebf5fa: Merge "Just use device configuration for Tethering." into honeycomb
...
* commit '29ebf5fa50f1dd44d1a8661f1ddd0134714979b6':
Just use device configuration for Tethering.
2011-02-28 09:54:17 -08:00
Robert Greenwalt
29ebf5fa50
Merge "Just use device configuration for Tethering." into honeycomb
2011-02-28 09:47:55 -08:00
Doug Zongker
26c433c1c6
am 489c7bff: show Build.SERIAL in settings > about > status
...
* commit '489c7bff5c54c35e7156a99337d538e08f3aab7f':
show Build.SERIAL in settings > about > status
2011-02-25 17:27:56 -08:00
Robert Greenwalt
4ad4b4fdf7
Just use device configuration for Tethering.
...
Don't need extra code here if the device is configured propertly.
Change-Id: Ieb65e36c1c91a62bbb0c8619e2efb34735fbb564
2011-02-25 17:25:38 -08:00
Doug Zongker
489c7bff5c
show Build.SERIAL in settings > about > status
...
For wifi-only devices, this may be the only way we have to identify
the device.
Change-Id: I70c09e4cdb101282e5d085bcab3f57c890bc7a98
Bug: 3490911
2011-02-25 15:01:50 -08:00
Eric Fischer
9dacc0a593
am 8639a46a: Import revised translations. DO NOT MERGE
...
* commit '8639a46a22a10e8a27ed5dbaea53a04f83d1d136':
Import revised translations. DO NOT MERGE
2011-02-25 11:12:43 -08:00
Eric Fischer
8639a46a22
Import revised translations. DO NOT MERGE
...
Change-Id: I3149acfebf3136ad06124721ee7e6c3615c5d20b
2011-02-25 10:51:03 -08:00
Amith Yamasani
88de52da15
am 5d6f0a16: Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb
...
* commit '5d6f0a16bbe7efb4db8c43ceb8e0058b5228d5c2':
Remove / re-word some settings for WiFi-only devices.
2011-02-24 17:19:15 -08:00
Amith Yamasani
5d6f0a16bb
Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb
2011-02-24 14:23:16 -08:00
Eric Fischer
5826947c83
am 73c3d6bc: Import revised translations. DO NOT MERGE
...
* commit '73c3d6bc24ae0fcdbcc184187b8e3c40514c3f16':
Import revised translations. DO NOT MERGE
2011-02-24 11:23:27 -08:00
Eric Fischer
73c3d6bc24
Import revised translations. DO NOT MERGE
...
Change-Id: I8eb20d2d26afec12263438f7e7d0358139a5d000
2011-02-24 11:03:37 -08:00
Amith Yamasani
0f85c48d6c
Remove / re-word some settings for WiFi-only devices.
...
Bug: 3468248
1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"
Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
2011-02-24 10:53:29 -08:00
Eric Fischer
3d30b374f6
am 058f62ba: (-s ours) am bd044818: Import revised translations. DO NOT MERGE
...
* commit '058f62baffb28df42cf0419fd06b776170289c71':
Import revised translations. DO NOT MERGE
2011-02-22 14:48:35 -08:00
Eric Fischer
058f62baff
am bd044818: Import revised translations. DO NOT MERGE
...
* commit 'bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
Import revised translations. DO NOT MERGE
2011-02-18 15:22:41 -08:00
Eric Fischer
afdbc0d9cc
am 2279d3e1: Import revised translations. DO NOT MERGE
...
* commit '2279d3e18fce7170fc48710617e2e814db5095fd':
Import revised translations. DO NOT MERGE
2011-02-16 10:37:32 -08:00
Eric Fischer
2279d3e18f
Import revised translations. DO NOT MERGE
...
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
2011-02-16 10:22:47 -08:00
Eric Fischer
bd0448185f
Import revised translations. DO NOT MERGE
...
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-14 17:25:07 -08:00
Amith Yamasani
5dd5aff80a
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
...
* commit '255fa0e96298da0f2ad1788fb79dfc353c8fc60a':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:06:23 -08:00
Amith Yamasani
255fa0e962
am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
...
* commit 'aae04e43ec277c095e181933976dfa7bfd044288':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:03:56 -08:00
Amith Yamasani
aae04e43ec
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
...
Bug: 3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
2011-02-10 17:19:11 -08:00
Eric Fischer
551a9876af
am d422079a: (-s ours) am 47d2ecd0: Import revised translations. DO NOT MERGE
...
* commit 'd422079aebadd598fe2b3f603b982978a615e11e':
Import revised translations. DO NOT MERGE
2011-02-10 13:51:31 -08:00
Eric Fischer
2cf42dfb2a
am c5d5334e: Import revised translations. DO NOT MERGE
...
* commit 'c5d5334e9c55e17c4df98af444c814569b3a77c5':
Import revised translations. DO NOT MERGE
2011-02-09 10:47:27 -08:00
Eric Fischer
c5d5334e9c
Import revised translations. DO NOT MERGE
...
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
2011-02-08 18:03:05 -08:00
Eric Fischer
d422079aeb
am 47d2ecd0: Import revised translations. DO NOT MERGE
...
* commit '47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
Import revised translations. DO NOT MERGE
2011-02-08 17:33:14 -08:00
Eric Fischer
f0c435c6c8
am 805b5add: Import revised translations. DO NOT MERGE
...
* commit '805b5add435d2c639363d239cf9abf32cd5a1fdd':
Import revised translations. DO NOT MERGE
2011-02-08 10:45:36 -08:00
Eric Fischer
805b5add43
Import revised translations. DO NOT MERGE
...
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
2011-02-07 17:30:01 -08:00
Eric Fischer
47d2ecd0c4
Import revised translations. DO NOT MERGE
...
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
Jake Hamby
93d419a290
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
...
* commit '47cb175396c8b020eded62d6c2293b777f20932b':
Fixed a memory leak in the bluetooth settings
2011-02-04 17:49:01 -08:00
Jake Hamby
47cb175396
am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
...
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
Jake Hamby
1798fc049e
Merge "Fixed a memory leak in the bluetooth settings"
2011-02-04 16:12:54 -08:00
Jim Miller
1d8c91faa7
am 78713aed: Fix 3419077: implement new volume control in Settings.
...
* commit '78713aed9e23fbf2f89edae87b2ba9e1387104ff':
Fix 3419077: implement new volume control in Settings.
2011-02-03 18:42:11 -08:00
Jim Miller
78713aed9e
Fix 3419077: implement new volume control in Settings.
...
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
2011-02-03 18:20:23 -08:00
Justin Ho
683d8a2137
am a9d8046c: Updated icons in settings
...
* commit 'a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
Updated icons in settings
2011-02-03 15:33:45 -08:00
Justin Ho
a9d8046c49
Updated icons in settings
...
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
2011-02-03 14:49:24 -08:00
Wink Saville
ec4045faba
am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
...
* commit '327147eb062a25ecab40d66ea14559070e0ecef3':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
2011-02-02 13:20:06 -08:00
Wink Saville
327147eb06
Have SecuritySettings and SoundSettings use getCurrentPhoneType
...
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.
bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
2011-02-02 11:30:25 -08:00
Andy Stadler
37033e1a88
am 9597406a: Restart encryption display after screen power cycle
...
* commit '9597406aa1b83867b03a47d1a5162969b924f2fc':
Restart encryption display after screen power cycle
2011-02-01 18:17:19 -08:00
Andy Stadler
9597406aa1
Restart encryption display after screen power cycle
...
Bug: 3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
2011-02-01 17:35:20 -08:00
Andy Stadler
5152fb05d1
am 95ef5575: Prevent NPE in onActivityResult
...
* commit '95ef5575a2b70d8c018f99b218353c925a70d418':
Prevent NPE in onActivityResult
2011-02-01 17:27:26 -08:00
Andy Stadler
95ef5575a2
Prevent NPE in onActivityResult
...
We're returning here in an unexpected condition; Treat all inputs
as suspect and verify before proceeding.
Bug: 3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
2011-02-01 16:22:41 -08:00
Andy Stadler
9d06aac2c0
am 1499740c: Preserve wakelock through rotation
...
* commit '1499740c13af5fbd5766a87825c3e789b37bab24':
Preserve wakelock through rotation
2011-02-01 16:17:51 -08:00
Andy Stadler
1499740c13
Preserve wakelock through rotation
...
Bug: 3381450
Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
2011-02-01 15:34:59 -08:00