Commit Graph

3828 Commits

Author SHA1 Message Date
Eric Fischer
145ad307ea am 84b23881: (-s ours) am 3dd76cfd: Import revised translations. DO NOT MERGE
* commit '84b23881e64ecd345a72c20860e7d64348ca95df':
  Import revised translations.  DO NOT MERGE
2011-02-28 22:23:26 -08:00
Amith Yamasani
26a1f898e0 Track changes to brightness and orientation lock in Settings.
Bug: 3491814
Bug: 3482859
Bug: 3497535

Since the system bar can now change brightness and orientation lock, Settings needs to listen
to changes to those settings and reflect in the UI.

Also fix a problem with restoring state on cancel when the brightness dialog is invoked a
second time.

Change-Id: I3ada6e77df9a6b013a16061877fcb6b55c94a903
2011-02-28 17:27:04 -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
Jaikumar Ganesh
20436ad626 Merge "Display imaging icon for printer devices." 2011-02-28 14:06:08 -08:00
Eric Fischer
3dd76cfd84 Import revised translations. DO NOT MERGE
Change-Id: I70ba332f5ad245551020bc785baea90aa6d0d447
2011-02-28 14:00:02 -08:00
Jaikumar Ganesh
5a3120cab7 Display imaging icon for printer devices.
Change-Id: Iea2a77bb3b79934174f6e39b080ade47bd119773
2011-02-28 11:27:35 -08:00
Jaikumar Ganesh
f3bbbe914f Merge "Add placeholders for imaging (printer) icon." 2011-02-28 11:21:50 -08:00
Jaikumar Ganesh
845efe838b Add placeholders for imaging (printer) icon.
Change-Id: I4571c8ada2a3451840986d702ad5f4405821bf62
2011-02-28 11:20:18 -08:00
Irfan Sheriff
02ec121900 Merge "Handle airplane mode change for hotspot settings" 2011-02-28 10:37:51 -08:00
Robert Greenwalt
3cdf323c87 am ca5cc015: am 29ebf5fa: Merge "Just use device configuration for Tethering." into honeycomb
* commit 'ca5cc0152f3fc26f871797dddd6c45cd2d265600':
  Just use device configuration for Tethering.
2011-02-28 10:15:38 -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
Irfan Sheriff
590e6c23b7 Use AsyncChannel in settings
Change-Id: I440f08dec986e4dad4b578ee4065d6063b8ef989
2011-02-27 22:08:33 -08:00
Doug Zongker
e18897bc22 am 26c433c1: am 489c7bff: show Build.SERIAL in settings > about > status
* commit '26c433c1c64416aed4736bb5a76b0ac4585958a1':
  show Build.SERIAL in settings > about > status
2011-02-25 17:30: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
Daisuke Miyakawa
7e3ff8eca6 Tiny fix for Wifi setup XL.
Change-Id: I918f4bc8dfbb84a3bdaf6aa74f326f2f5e22bfe2
2011-02-25 17:12:56 -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
46b3a32529 Merge "Import revised translations." 2011-02-25 11:49:44 -08:00
Eric Fischer
73c49db922 Import revised translations.
Change-Id: I82a7d70f3d77f27fb223f1ae178a668d77e01a38
2011-02-25 11:37:53 -08:00
Eric Fischer
5cfa69273a am 9dacc0a5: (-s ours) am 8639a46a: Import revised translations. DO NOT MERGE
* commit '9dacc0a593ccb170998c6195cc4187b595406a8b':
  Import revised translations.  DO NOT MERGE
2011-02-25 11:26:29 -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
Vasu Nori
587aebad8a Merge "replace some ugly code with not-too-ugly code.." 2011-02-24 23:37:38 -08:00
Vasu Nori
8128ff8cbe replace some ugly code with not-too-ugly code..
replaced this kind of code
   string + " " + number + "out of" + " " + number
with this
   String.format("%1$d out of %2$d", number, number);

Change-Id: If1cc296da48dd6823e9081a55b6eab2e3fcee552
2011-02-24 23:32:08 -08:00
Amith Yamasani
a377470486 am 88de52da: am 5d6f0a16: Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb
* commit '88de52da15ed94d6eb70ae75e0df2ddbce923eb0':
  Remove / re-word some settings for WiFi-only devices.
2011-02-24 20:31:58 -08:00
Daisuke Miyakawa
e056cc2ac8 Merge "Fix visual stuffs of XL Wifi setup." 2011-02-24 17:43:21 -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
Daisuke Miyakawa
be10e75c8c Fix visual stuffs of XL Wifi setup.
- remove delayed button enabler stuff including
  "add network" and "refresh" buttons
- add bottom padding to stop moving bottom divider up/down
- add padding for the preference, which should have been
  done in I1f8fb8eca11d52d9c18866301553110c2147b3ef

Bug: 3424645
Change-Id: Ifc8120c123ee154fbe11526474edc65c5943eea6
2011-02-24 16:30:56 -08:00
Irfan Sheriff
8e10affcde Handle airplane mode change for hotspot settings
Bug: 2618370
Change-Id: I7d14603aef9aaf7665ceaebfc314858226400e04
2011-02-24 16:08:53 -08:00
Kenny Root
12edcc2068 Merge "Data race in initialization of misc files info" 2011-02-24 15:09:52 -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
c3ed121bf9 Merge "Import revised translations." 2011-02-24 14:04:48 -08:00
Kenny Root
76c5328935 Data race in initialization of misc files info
Bug: 3480796
Change-Id: I1ff2e7c167872f4e2f11c93981b2dd6ebd0ee897
2011-02-24 12:44:33 -08:00
Eric Fischer
d23c221afe Import revised translations.
Change-Id: If127a3dcc17eb1ddebf5ef4cb08bb3b1dcfdc418
2011-02-24 11:58:22 -08:00
Eric Fischer
8ff399b24f am 5826947c: (-s ours) am 73c3d6bc: Import revised translations. DO NOT MERGE
* commit '5826947c83d615e46303297b356b42f851cc6cdb':
  Import revised translations.  DO NOT MERGE
2011-02-24 11:27:20 -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
Jaikumar Ganesh
58a6e3ab8c Merge "Make BluetoothPan implement BluetoothProfile." 2011-02-23 15:51:04 -08:00
Amith Yamasani
37b84f3db1 Merge "Don't change the settings title when editing VPN entries." 2011-02-23 15:15:02 -08:00
Jaikumar Ganesh
9ad703cdb9 Make BluetoothPan implement BluetoothProfile.
This makes it consistent across all other profiles.

Change-Id: I4c0694d042d7ed1b78c92ca3be38c8d543886769
2011-02-23 13:30:08 -08:00
Eric Fischer
5f3bed7dc0 am 3d30b374: (-s ours) am 058f62ba: (-s ours) am bd044818: Import revised translations. DO NOT MERGE
* commit '3d30b374f6cedb63d06844f6b2c7fa33f50dd77d':
  Import revised translations.  DO NOT MERGE
2011-02-22 21:36:06 -08:00
Robert Greenwalt
c9bc99b246 Use new NetworkUtils.numericToInetAddress.
Fetches an InetAddress without danger of an accidental dns lookup.

Change-Id: Ic0ca48cdd06bbbf6f0fb2cd4ae7832dde451ccae
2011-02-22 15:56:45 -08:00
Amith Yamasani
cffe9e3d40 Merge "Display -> Screen" 2011-02-22 14:52:13 -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
Amith Yamasani
7456f67bb9 Display -> Screen
Bug: 3337458

Change occurences of Display to Screen.

Change-Id: I39ae963d4797c21a5742e4eb81de743b02cd09c2
2011-02-22 14:44:18 -08:00
Amith Yamasani
a576f6228e Don't change the settings title when editing VPN entries.
Bug: 3342918
Change-Id: Ib3a56d3fb644b9b07aeb0b50ec4642714852d6c0
2011-02-22 13:28:32 -08:00
Lorenzo Colitti
a52c5698ca Support configuring the protocol in APN settings.
Bug: 3333633
Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
2011-02-22 01:42:32 -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