Commit Graph

3636 Commits

Author SHA1 Message Date
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
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
Jaikumar Ganesh
77bcd7e807 Update code for making BluetoothInputProfile implement BluetoothProfile.
Change-Id: Ib04abc590429eaa40c0ea1bd24fa728d41306fe8
2011-02-18 14:57:25 -08:00
Wink Saville
0ba170c979 Merge "Changes for ril.h version 6." 2011-02-18 14:05:39 -08:00
Vasu Nori
e00489a835 Merge "display amount of storage on /sdcard by downloads, music etc" 2011-02-18 12:06:41 -08:00
Vasu Nori
21809740f2 display amount of storage on /sdcard by downloads, music etc
when music storage usage is clicked on, show music app
when downloads storage usage is clicked on, show download app
when pic/videos storage usage is clicked on, show gallery app

Change-Id: Ia1c341013e550acb537e6f8a4f4558030888cc45
2011-02-18 12:05:13 -08:00
Roy West
642b89d0f4 Fix double-space in string.
Change-Id: I6d1cf8a100ab6c56330f736d4a1582ba95e6d8e1
2011-02-17 21:41:46 -08:00
Roy West
0178b15fcc Fix bug 3463538.
Change-Id: I29c08eace1ba14f7d5cbad55cffbb2b024f518da
2011-02-17 21:34:50 -08:00
Roy West
92f94eb9ea Fix 3468005.
Change-Id: Idb8ceebbda8025dab13f2c5253d2d04c7eb1b710
2011-02-17 20:01:07 -08:00
Wink Saville
882c74a679 Changes for ril.h version 6.
Change-Id: I7e269e5a971c70d6d9a1731b82c538b722cbc01d
2011-02-17 12:00:03 -08:00
Irfan Sheriff
55b8379d2f Merge "Add support for WPA for soft Ap" 2011-02-17 11:50:03 -08:00
Eric Fischer
82d880de75 Import revised translations.
Change-Id: I51cf9d94cd14e67e56a86e669a92e1a64eb6540b
2011-02-17 10:20:39 -08:00
Irfan Sheriff
c1a322854d Add support for WPA for soft Ap
Bug: 2771935
Change-Id: I2c02b4e686a65e0748f4a4afd27dc49602d6dd98
2011-02-17 00:39:59 -08:00
Eric Fischer
eb3c23d426 am afdbc0d9: (-s ours) am 2279d3e1: Import revised translations. DO NOT MERGE
* commit 'afdbc0d9ccc6071ffb5d5bb23b80caf15d93fb36':
  Import revised translations.  DO NOT MERGE
2011-02-16 10:41:55 -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
Justin Ho
2a811d587d Merge "Updated encryption droid and settings launcher icon" 2011-02-16 10:29:47 -08:00
Eric Fischer
2279d3e18f Import revised translations. DO NOT MERGE
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
2011-02-16 10:22:47 -08:00
Amith Yamasani
5c77d57b9f Merge "Fix for crash in TetherSettings when monkey is running." 2011-02-16 10:14:10 -08:00
satok
85819c8c32 Fix a bug which can't enable mutiple non-preinstalled IMEs at a time
Bug: 3459430
Change-Id: Ieee340a92862047135a03c131517b927e1ed2f5e
2011-02-16 19:04:29 +09:00
Jake Hamby
60d5e429d4 Merge "Bluetooth PAN icon" 2011-02-15 15:50:19 -08:00
Daisuke Miyakawa
a5db24d6ef Merge "Remove padding between top divider and wifi list" 2011-02-15 15:37:53 -08:00
Jim Miller
b1d8754842 Merge "Fix 3409373: Don't grey out Cancel button on confirm pattern screen" 2011-02-15 15:04:00 -08:00
Jim Miller
204b1b2630 Merge "Fix 3384928: Update "disabled" strings for lock methods" 2011-02-15 14:33:47 -08:00
Daisuke Miyakawa
beec0b2da6 Remove padding between top divider and wifi list
We need View in addtion to ProgressBar, since the latter doesn't
allow us to control its padding on the bottom.

Bug: 3443287
Change-Id: I1f8fb8eca11d52d9c18866301553110c2147b3ef
2011-02-15 14:11:55 -08:00
Justin Ho
77fd6bceb5 Updated encryption droid and settings launcher icon
Change-Id: I550a65d7567dbb139e440acd3d0f32d0cce4c9fc
2011-02-15 07:26:35 -08:00
Jim Miller
4cdb398787 Merge "Fix 3361307: Disable activity transition in pattern tutorial" 2011-02-14 19:35:18 -08:00
Jim Miller
64aafdcfac Fix 3384928: Update "disabled" strings for lock methods
This updates the disabled strings to give the user an idea
why the given methods are disabled.  It's either because
the DevicePolicyAdmin disabled it ("administrator") or
because the device is encrypted.

Change-Id: I0e99742a838037d069f686ed98f9622754bafe13
2011-02-14 18:41:29 -08:00
Jim Miller
fd7e7b3b94 Merge "Fix 3444669: Fix message string for max password length" 2011-02-14 18:23:44 -08:00
Jim Miller
9afb14de3b Fix 3444669: Fix message string for max password length
Change-Id: I5828dc0127b0296d87bdc0c9e251fd9c9a92bd0d
2011-02-14 17:58:10 -08:00
Justin Ho
1efb914211 Bluetooth PAN icon
Change-Id: I284cf136e7d6954768770d0a3f50e9a6c7070ae1
2011-02-14 17:45:13 -08:00
Jim Miller
36fd50a4e7 Fix 3361307: Disable activity transition in pattern tutorial
This disables the transition animation that happens between
the pattern tutorial and the pattern entry screen.  This only
happens the first time the pattern is ever selected.

Change-Id: Iee0ffc84a672da4d559e047ef84aca8d6ab0937f
2011-02-14 17:43:02 -08:00
Eric Fischer
bd0448185f Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-14 17:25:07 -08:00
Jim Miller
77cb854d68 Fix 3409373: Don't grey out Cancel button on confirm pattern screen
Change-Id: I5832fd92cb71c91239326b295c36d207286263f2
2011-02-14 17:07:22 -08:00
Dianne Hackborn
2372ba5b54 Fix issue #3405731: Manage applications app names don't update with locale
Change-Id: Ia7dcf7973bde6785afb5978ee2a7858bc6740582
2011-02-14 15:47:19 -08:00
Amith Yamasani
e419bc1bed Fix for crash in TetherSettings when monkey is running.
Bug: 3407666

onCreateView can get called on returning from another fragment. Moved the
relevant code to onCreate().

Change-Id: Icf08c18a3981051cce4eca2d07334d0a9f3c0116
2011-02-14 14:19:08 -08:00
Robert Greenwalt
cd44f206e0 Merge "Use the new LinkProperties gateways." 2011-02-11 11:38:51 -08:00
Amith Yamasani
f942732c4c am 5dd5aff8: (-s ours) am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '5dd5aff80a81aa2d1114054bd50a98f58ca80bde':
  Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:09:06 -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
Robert Greenwalt
caf8cf5cf5 Use the new LinkProperties gateways.
Changed from singular gateway InetAddress to plural.

bug:3438810
Change-Id: I07dff8b7dd620a444b5ba2e4f7a87c76a0736fdb
2011-02-11 10:11:04 -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
Irfan Sheriff
f11033f7ab Merge "Re-enable wifi proxy UI" 2011-02-10 14:56:52 -08:00
Eric Fischer
fb3e402cae am 551a9876: (-s ours) am d422079a: (-s ours) am 47d2ecd0: Import revised translations. DO NOT MERGE
* commit '551a9876af8cb6fbdaababf292001d4a23dcd6c8':
  Import revised translations.  DO NOT MERGE
2011-02-10 13:56:23 -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