Commit Graph

1790 Commits

Author SHA1 Message Date
Tobias Brunner
f7ed857fc4 Allow users to create shortcuts to the VPN settings on the Home Screen.
Change-Id: I4bf78c78ae35ea3d485e71a46f7aecdecdbfd8a0
2010-06-28 13:10:26 +02:00
Kenny Root
05c2b96f42 am 4e012037: Import revised translations
Merge commit '4e01203746710646227470390d4a9f7fb52c6238' into froyo-plus-aosp

* commit '4e01203746710646227470390d4a9f7fb52c6238':
  Import revised translations
2010-06-21 11:18:33 -07:00
Kenny Root
4e01203746 Import revised translations
Change-Id: I170f4347b73055ce204d75cfa1bef5cc22b928b1
2010-06-21 11:04:50 -07:00
Kenny Root
08c1d6c480 am db751db4: Import revised translations
Merge commit 'db751db4c919ea4ab981d52017b9741d386dad19' into froyo-plus-aosp

* commit 'db751db4c919ea4ab981d52017b9741d386dad19':
  Import revised translations
2010-06-21 09:14:55 -07:00
Kenny Root
db751db4c9 Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
2010-06-20 19:00:54 -07:00
The Android Open Source Project
8d770c707b merge from open-source master
Change-Id: I5d1276f8343d9f590616dc2ab91e0164b2d31426
2010-06-15 09:36:38 -07:00
Jean-Baptiste Queru
2d40cdb894 Merge "Disabled verbose logging" 2010-06-14 16:39:36 -07:00
The Android Open Source Project
5b6a9a8f00 ignore from open-source master
Change-Id: I1b8bdb583dc0ad66b920f203490aa491d1e1bfb2
2010-06-14 14:33:13 -07:00
The Android Open Source Project
c7984e5d07 merge from open-source master
Change-Id: Iaaf6c1098fc0c5a44a7450d790ccaf2b1d2f64bb
2010-06-14 14:30:58 -07:00
Jean-Baptiste Queru
476bc5af86 Merge "replaced deprecated setButton methods" 2010-06-14 12:18:24 -07:00
Jean-Baptiste Queru
424b69c63f Merge "Replaced deprecated String Constructor" 2010-06-14 12:13:56 -07:00
The Android Open Source Project
b817cb6e39 merge from open-source master
Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
2010-06-14 11:08:28 -07:00
Jean-Baptiste Queru
3ba01ea0d1 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:25:34 -07:00
The Android Open Source Project
00c406364e merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
2010-06-11 13:31:28 -07:00
Anders Hammar1
b2dd90383b Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.

Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
2010-06-11 14:27:29 +02:00
Kenny Root
97ece591a6 am dc2fdd09: Import revised translations
Merge commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into froyo-plus-aosp

* commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
  Import revised translations
2010-06-10 11:48:13 -07:00
Kenny Root
dc2fdd091f Import revised translations
Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34
2010-06-10 11:37:35 -07:00
Kenny Root
88f6b989d2 am a791e2d6: Import revised translations
Merge commit 'a791e2d63bfb5218db4890184e68381d4261818f' into froyo-plus-aosp

* commit 'a791e2d63bfb5218db4890184e68381d4261818f':
  Import revised translations
2010-06-09 23:04:13 -07:00
Kenny Root
a791e2d63b Import revised translations
Change-Id: Ib63294fbc8fedc0517f38bbffd4c0fe536866bdc
2010-06-09 22:59:20 -07:00
Christian Mehlmauer
b8eb474b92 Disabled verbose logging
Change-Id: If4612b5c045fb9819ab0668a628933a530606262
2010-06-05 14:42:00 +02:00
Kenny Root
e4c0cd6d8c am 365ef4a0: Update strings for backup
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp

* commit '365ef4a095189573b67573f6750f5891c11b7895':
  Update strings for backup
2010-06-03 17:05:06 -07:00
Kenny Root
365ef4a095 Update strings for backup
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
2010-06-03 16:42:00 -07:00
Kenny Root
273464d5a1 am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Irfan Sheriff
a496684019 am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Jeff Brown
7c5717c064 am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1' into froyo-plus-aosp

* commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1':
  Fix NPE in InstalledAppDetails activity when app not found.
2010-05-28 12:12:21 -07:00
Jeff Brown
b0bcf9f7f5 Fix NPE in InstalledAppDetails activity when app not found.
Added some extra checks to ensure that the activity exits from
onCreate, onResume and processMoveMsg promptly when the app
info cannot be refreshed.

Bug: b/2711730
Change-Id: Ied22fadce09326dd33cf201e5e9281990bf3abbd
2010-05-27 14:32:31 -07:00
Irfan Sheriff
c1a587c9e9 am f3373c99: No quotes for password
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp

* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
  No quotes for password
2010-05-26 13:04:05 -07:00
Irfan Sheriff
f3373c9949 No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.

Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
2010-05-26 12:53:24 -07:00
Christian Mehlmauer
58702fea9b replaced deprecated setButton methods
Change-Id: Ic112dc6acdb62586db741e996b0344d38c71d12f
2010-05-25 19:31:39 +02:00
Christian Mehlmauer
a06b4e69aa Replaced deprecated String Constructor
Change-Id: I452400c9cb00b60316b0270b2f4a68c15d80b698
2010-05-25 19:25:05 +02:00
Christian Mehlmauer
82163dec18 replaced deprecated getIntent with parseURI
Change-Id: Iabf82ff0f9be2a76dece9aafe8603bf83ac7d049
2010-05-25 18:39:46 +02:00
The Android Open Source Project
4811287623 merge from open-source master
Change-Id: Id9c258165d9bb326271218a562d782fa52608213
2010-05-19 09:12:47 -07:00
The Android Open Source Project
50c7f2d92a merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
2010-05-19 08:30:08 -07:00
Romain Guy
3514cdc3b0 Merge "Removed Calls to deprecated APIs and unused imports" 2010-05-19 00:00:14 -07:00
Dianne Hackborn
fcc577b2a1 am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp

* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:26:17 -07:00
Dianne Hackborn
f9762a2c39 Fix issue #2694643: Remove/Resolve STOPSHIP
*poof*

Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
2010-05-18 15:22:32 -07:00
Henrik Tuszynski
de6007cbf8 A button in the master clear information screen was partly hidden.
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.

Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
2010-05-18 09:25:05 +02:00
Irfan Sheriff
75a43c6054 am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo
Merge commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp

* commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448':
  Fix crash for tether with quotes in SSID
2010-05-17 13:29:00 -07:00
Irfan Sheriff
cd8f068ed2 Merge "Fix crash for tether with quotes in SSID" into froyo 2010-05-17 13:25:58 -07:00
Irfan Sheriff
18dc7ea709 Fix crash for tether with quotes in SSID
Multiple quotes cause havoc with netd interaction right now.
The solution is to revert the changes for WifiConfiguration on
Access Point side done in Change I0f1e508b and remove all quotes
in the SSID.

Essentially a low risk one line change on top of the revert.

We dont expose API for WifiConfiguration on AP side. This solution
essentially means we treat SSID in WifiConfiguration on AP side
differently. When we do expose things, we should make things consistent.

Change-Id: I0a7e5074b83ace743fc843ee61c1ff86cde8267f
2010-05-17 13:20:39 -07:00
Christian Mehlmauer
0193bf8b3d Removed Calls to deprecated APIs and unused imports
Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
2010-05-17 21:25:15 +02:00
Kenny Root
7a4cff13c9 am 28b245c0: Import revised translations
Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp

* commit '28b245c01d49b7710d1a918849fe8f159e8f43b5':
  Import revised translations
2010-05-17 11:45:04 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Chung-yih Wang
8719f0d20a am 8c81257f: Fix the double-quoted SSID issue.
Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp

* commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
  Fix the double-quoted SSID issue.
2010-05-14 23:16:25 -07:00
Chung-yih Wang
8c81257f70 Fix the double-quoted SSID issue.
Bug id http://b/issue?id=2684571

Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
2010-05-15 10:57:23 +08:00
The Android Open Source Project
542b8f2b47 merge from open-source master
Change-Id: I0b8f7bedc11e98f2c790669bbbe5a7807947e196
2010-05-12 09:34:10 -07:00
The Android Open Source Project
0b53ac733c merge from open-source master
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
2010-05-12 09:33:50 -07:00
Henrik Hall
a7ece710fe Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version

Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
2010-05-11 13:38:44 -07:00