Commit Graph

19388 Commits

Author SHA1 Message Date
Geoff Mendal
d697b11a13 Import translations. DO NOT MERGE
Change-Id: I98b7918077e100eb54eaeb121e53ed9b60b624d5
Auto-generated-cl: translation import
2015-03-21 02:21:25 -05:00
Geoff Mendal
cfad6fc1ff Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
2015-02-26 13:08:22 -08:00
Geoff Mendal
8d15f5b991 Import translations. DO NOT MERGE
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
2015-01-21 07:12:37 -08:00
Geoff Mendal
11c2c80f9d Import translations. DO NOT MERGE
Change-Id: Ib29187f3cc18e0b6774a65b7fc34623fd290c0f9
Auto-generated-cl: translation import
2015-01-05 06:34:10 -08:00
Baligh Uddin
36ddc8a1c3 Import translations. DO NOT MERGE
Change-Id: I0276ab183a6b8f4f2afef13961cd91e1e4593587
Auto-generated-cl: translation import
2014-12-22 09:12:51 -08:00
Geoff Mendal
3c08ea9741 Import translations. DO NOT MERGE
Change-Id: Ie9e5f675f83b6e8b48302066d22578c23f96f070
Auto-generated-cl: translation import
2014-12-17 06:39:27 -08:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
2014-12-15 16:27:39 +00:00
Narayan Kamath
7a250b8288 Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
2014-12-15 14:32:38 +00:00
Narayan Kamath
f25627c0c9 Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
2014-12-12 14:22:06 +00:00
Geoff Mendal
3260f78cb5 Import translations. DO NOT MERGE
Change-Id: Ide3e406681ef2f9a6198de5436f4cd1df3888282
Auto-generated-cl: translation import
2014-12-08 06:51:46 -08:00
Geoff Mendal
0bda36df16 Import translations. DO NOT MERGE
Change-Id: I937efd74232d29cf16ddf148661da8e0f2f6896e
Auto-generated-cl: translation import
2014-11-10 14:33:04 -08:00
Baligh Uddin
15adc9b3ac Import translations. DO NOT MERGE
Change-Id: I547111eb6c7ff68ebe835d65bb24e0a841ecdb90
Auto-generated-cl: translation import
2014-11-06 10:02:24 -08:00
Baligh Uddin
43b675e01e Import translations. DO NOT MERGE
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
2014-10-30 11:46:41 -07:00
Geoff Mendal
bfe382468c Import translations. DO NOT MERGE
Change-Id: I1688e8e51ff69ce47c65145e12550f712fc9b58d
Auto-generated-cl: translation import
2014-10-15 18:03:52 -07:00
Geoff Mendal
bed6c4d1d4 Import translations. DO NOT MERGE
Change-Id: I80c9e03e345f2a8ec20a4237922d0eb7e08b5502
Auto-generated-cl: translation import
2014-10-13 13:03:15 -07:00
Geoff Mendal
691793a059 Import translations. DO NOT MERGE
Change-Id: I78911b5f73395927c6981792f4ec9b0f4e48c236
Auto-generated-cl: translation import
2014-10-06 17:20:48 -07:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
2014-08-26 21:00:49 -07:00
Baligh Uddin
0a07ee810c Import translations. DO NOT MERGE
Change-Id: I369c46e528751386b3c713143036b233d715dc29
Auto-generated-cl: translation import
2014-08-18 19:09:47 -07:00
Baligh Uddin
b82066e238 Import translations. DO NOT MERGE
Change-Id: Ibd15fd67b24d78f6c4378008e24d7a50874b7491
Auto-generated-cl: translation import
2014-08-11 21:22:01 -07:00
Geoff Mendal
179544d151 Import translations. DO NOT MERGE
Change-Id: I7a8d40cfecee4835e65e0366a8cfe0f05a3dace2
Auto-generated-cl: translation import
2014-07-30 18:41:18 -07:00
Baligh Uddin
9ab097413a Remove deprecated locales
Change-Id: Ibba34d691800aaa4fad4f4e8cfe6ca09aaae2cd3
2014-07-18 11:43:06 -07:00
Baligh Uddin
a45d1f8320 Remove deprecated locales - DO NOT MERGE
Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4
2014-07-19 13:05:24 -07:00
Baligh Uddin
befb4e2e79 Remove deprecated locales
Change-Id: If897a5a2b65236d1b9da8b01198b9292602ee179
2014-07-17 15:43:14 -07:00
Xia Wang
52ddc781a1 am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '70ce016f84ce6c54b2c5f07adf86e415de5598cb':
  Allow VPN to stay connected for some time before disconnecting it.
2014-04-05 00:54:54 +00:00
Xia Wang
d2f56f07f9 am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit 'ac768973bc23b9f8f266013c20d301554729fd70':
  Allow VPN to stay connected for some time before disconnecting it.
2014-04-05 00:48:38 +00:00
Xia Wang
ce11881acc Allow VPN to stay connected for some time before disconnecting it.
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
2014-04-04 17:23:47 -07:00
Xia Wang
c4e68c1dcd am 2f633ca3: am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '2f633ca3a5813eb3fece716448308bf8e7d351ee':
  Add legacy VPN test framework and test cases
2014-04-02 03:55:59 +00:00
Xia Wang
8361a97c43 am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '3e23823015d2ad0679d89adc2a62c7d568adada8':
  Add legacy VPN test framework and test cases
2014-04-02 03:45:56 +00:00
Xia Wang
340bda7154 Add legacy VPN test framework and test cases
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases

Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
2014-04-01 17:45:58 -07:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Baligh Uddin
38bd642e23 Remove deprecated locales
Bug:11340849

Change-Id: I991b4918581b47f38f32dcad0fe77aa9301414c0
2013-12-09 22:54:15 +00:00
Baligh Uddin
fb9e864626 Import translations. DO NOT MERGE
Change-Id: I13c51ef2316f477f02ec447afcd63f036e89ab6f
Auto-generated-cl: translation import
2013-09-14 21:12:30 -07:00
Baligh Uddin
73f6f1bfd1 Import translations. DO NOT MERGE
Change-Id: I58db88d216a60723598c41e786cbfcfc972d0dfe
Auto-generated-cl: translation import
2013-09-09 13:34:45 -07:00
Baligh Uddin
4f0ca04688 Import translations. DO NOT MERGE
Change-Id: Iaf20a20f5cdc9d59579f1a901138f26b9a449216
Auto-generated-cl: translation import
2013-08-28 23:43:04 -07:00
Baligh Uddin
1d619e1ead Import translations. DO NOT MERGE
Change-Id: I62ee2b860598c7e98e6a1ad74f80a086b1da2d77
Auto-generated-cl: translation import
2013-08-26 14:06:36 -07:00
Baligh Uddin
293ed7bd4c Import translations. DO NOT MERGE
Change-Id: I2c72ecd95f32cca154a87fee61ce55634e95f3e5
Auto-generated-cl: translation import
2013-08-21 16:15:15 -07:00
Baligh Uddin
50d2f8b794 Import translations. DO NOT MERGE
Change-Id: I5f89a996c28fbe668105892be7d40eec26065de3
Auto-generated-cl: translation import
2013-08-19 12:14:29 -07:00
Baligh Uddin
b590a5d9dc Import translations. DO NOT MERGE
Change-Id: I5681e12c45cbea55910772e7761dc122bc55ff71
Auto-generated-cl: translation import
2013-05-08 11:07:07 -07:00
Jake Hamby
95c1003f1c Fix Bluetooth enable dialog to match Android style guide.
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.

Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.

Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
2012-11-20 18:21:44 -08:00
Elliott Hughes
6aeed7846c am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit 'f587f5a54d4717c8f147ce46979f65f9301cd81d':
  Fix /proc/version parsing in Settings.
2012-09-10 19:05:37 -07:00
Elliott Hughes
d267d377fb Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
2012-09-10 17:58:15 -07:00
Ying Wang
b47e427f72 Import translations. DO NOT MERGE
Change-Id: I25f8e8923c50377df9a517538e6b76bafac4af9a
Auto-generated-cl: translation import
2012-07-13 13:12:21 -07:00
Eric Fischer
b5023d25d2 Import revised translations.
Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
2011-11-29 11:19:18 -08:00
Eric Fischer
69f6eb2643 Import revised translations.
Change-Id: If0d8a3d2b1ede8cc56519ddecac97c12f7042fe7
2011-11-02 10:30:43 -07:00
Gilles Debunne
5f8ebe2ee8 Unused assets removed from Settings
Change-Id: I32cbeba75d46e536191f55a94185ec0e896fa397
2011-10-28 17:41:08 -07:00
Eric Fischer
715a9ad8e9 Import revised translations.
Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec
2011-10-18 15:45:53 -07:00
Eric Fischer
5b892f12e6 Import revised translations.
Change-Id: I90d6935c58330a986ce67086f7af4ae9eb96e8ba
2011-08-22 11:34:42 -07:00
Justin Ho
5993f066c1 Updated Settings icons
Removed More wifi settings icon
Bug: 5084184

Change-Id: I4ed948bd24544d512179765eb917f3932f60751b
2011-08-09 14:17:17 -07:00
Gilles Debunne
e9a1a39e31 Unused assets removed from Settings
Change-Id: I321321fe8f730c1e664245944db4ab77ca4c7539
2011-07-20 14:26:09 -07:00
Eric Fischer
a1307695c1 Import revised translations.
Change-Id: Ib916cb8bb0b6f45452300b50b5ac138f89a89c29
2011-06-20 14:54:12 -07:00