Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,218 Commits 1 Branch 0 Tags
2f633ca3a5813eb3fece716448308bf8e7d351ee
Commit Graph

12218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xia Wang
2f633ca3a5 am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '8361a97c43a49b5e7528afd5baeca624d909bbf9':
  Add legacy VPN test framework and test cases
 2014-04-02 03:51:38 +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
3e23823015 am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '836eff87a93f5b2857b41763197ab6782581aafc':
  Add legacy VPN test framework and test cases
 2014-04-02 03:40:26 +00:00
Xia Wang
836eff87a9 Merge "Add legacy VPN test framework and test cases" into klp-dev 2014-04-02 03:36:50 +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
Baligh Uddin
b89c4d713b am cf743762: (-s ours) am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit 'cf743762611ceb918aabee179ef10f81ccc90aaf':
  Import translations. DO NOT MERGE
 2014-04-01 00:21:31 +00:00
Baligh Uddin
cf74376261 am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit '88adaa72a385c3199787ecd3dae826f25d38572d':
  Import translations. DO NOT MERGE
 2014-04-01 00:15:49 +00:00
Baligh Uddin
88adaa72a3 am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit '112916b59634a86195880a1368d8d60a86f33188':
  Import translations. DO NOT MERGE
 2014-04-01 00:09:19 +00:00
Baligh Uddin
b3545a548f am 518a5037: (-s ours) Import translations. DO NOT MERGE 
* commit '518a503740bcb900fe8a69c86f5826466f99ee6e':
  Import translations. DO NOT MERGE
 2014-04-01 00:08:46 +00:00
Baligh Uddin
518a503740 Import translations. DO NOT MERGE 
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
 2014-03-31 14:42:20 -07:00
Baligh Uddin
112916b596 Import translations. DO NOT MERGE 
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
 2014-03-31 14:40:25 -07:00
John Spurlock
ce1b22cf66 am c4231382: DO NOT MERGE Settings: Implement new required method. 
* commit 'c423138247857312a4ac6ad32cb482868315bd61':
  DO NOT MERGE Settings: Implement new required method.
 2014-03-28 19:01:12 +00:00
John Spurlock
c423138247 DO NOT MERGE Settings: Implement new required method. 
Only required since it uses the non-public version
of the api.

Bug:13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
 2014-03-28 09:41:30 -04:00
Baligh Uddin
1df63dd8af am 584ac4c5: (-s ours) am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE 
* commit '584ac4c525d45dfdc61f3f9db746582622e2ab5b':
  Import translations. DO NOT MERGE
 2014-03-27 23:10:42 +00:00
Baligh Uddin
584ac4c525 am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE 
* commit 'f39672bfac77a604a3a04484f7d88adc4ecf9c66':
  Import translations. DO NOT MERGE
 2014-03-27 23:05:03 +00:00
Baligh Uddin
5c5bfbb048 am 1dc01d10: (-s ours) Import translations. DO NOT MERGE 
* commit '1dc01d10ddb19355dc21b6e677afcf33aa460136':
  Import translations. DO NOT MERGE
 2014-03-27 22:22:05 +00:00
Baligh Uddin
f39672bfac am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE 
* commit '3a9b49f975df7c53e86dd795e21f904442c22a4a':
  Import translations. DO NOT MERGE
 2014-03-27 22:22:03 +00:00
Baligh Uddin
1dc01d10dd Import translations. DO NOT MERGE 
Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import
 2014-03-26 14:11:08 -07:00
Baligh Uddin
3a9b49f975 Import translations. DO NOT MERGE 
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
 2014-03-26 14:08:55 -07:00
Baligh Uddin
a2ea9ac68f am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5f4696f8e00731d2825ec6fc7d24c020f3e75f73':
  Import translations. DO NOT MERGE
 2014-03-25 19:06:01 +00:00
Baligh Uddin
5f4696f8e0 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 19:01:04 +00:00
Baligh Uddin
bbcd64cb8b am 7bad0786: (-s ours) am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit '7bad0786ec63fc513a195579417901722c8689db':
  Import translations. DO NOT MERGE
 2014-03-25 17:07:48 +00:00
Baligh Uddin
7bad0786ec am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
  Import translations. DO NOT MERGE
 2014-03-25 17:02:02 +00:00
Baligh Uddin
b86dff8480 am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
  Import translations. DO NOT MERGE
 2014-03-25 16:54:48 +00:00
Baligh Uddin
7eab908944 Import translations. DO NOT MERGE 
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
 2014-03-24 13:01:09 -07:00
Baligh Uddin
da4a6a53d4 Import translations. DO NOT MERGE 
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
 2014-03-24 12:59:14 -07:00
Baligh Uddin
31a72b0769 am e3a0b402: (-s ours) am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit 'e3a0b402c3d9163b5dff884c44d3a5f2a86e80aa':
  Import translations. DO NOT MERGE
 2014-03-20 19:09:05 +00:00
Baligh Uddin
e3a0b402c3 am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE
 2014-03-20 19:02:30 +00:00
Baligh Uddin
2e71c1df7c am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE
 2014-03-20 18:41:54 +00:00
Wei Wang
a95228ff5b am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit '41f5437def4b97581d67b5636ca2dba10f8eb385':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 16:24:12 +00:00
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
 2014-03-19 22:37:27 -07:00
Baligh Uddin
947e899585 Import translations. DO NOT MERGE 
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
 2014-03-19 13:10:41 -07:00
Geoff Mendal
26fa5188c7 am 27259b53: (-s ours) am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit '27259b53e6db8781ef7aea614298d50bf26d30e4':
  Import translations. DO NOT MERGE
 2014-03-17 20:52:13 +00:00
Geoff Mendal
27259b53e6 am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
  Import translations. DO NOT MERGE
 2014-03-17 20:46:32 +00:00
Geoff Mendal
c8131cb90e am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit 'e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
  Import translations. DO NOT MERGE
 2014-03-17 20:34:20 +00:00
Geoff Mendal
e8de72e53a Import translations. DO NOT MERGE 
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
 2014-03-17 12:42:54 -07:00
David Braun
ca95017fa3 am c0737638: am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text 
* commit 'c07376380f566e241dd4ba85a23ff791bdea1524':
  Add string parameter order to default SMS dialog text
 2014-03-14 16:32:41 +00:00
Baligh Uddin
c5ff40fea6 am 1badeea1: (-s ours) am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE 
* commit '1badeea19584849f4e324d658a0ce160e6707388':
  Import translations. DO NOT MERGE
 2014-03-14 16:32:40 +00:00
David Braun
c07376380f am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text 
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
  Add string parameter order to default SMS dialog text
 2014-03-14 16:28:00 +00:00
Baligh Uddin
1badeea195 am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE 
* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
  Import translations. DO NOT MERGE
 2014-03-14 16:27:48 +00:00
David Braun
63ac6a06ef am edcb923d: Add string parameter order to default SMS dialog text 
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text
 2014-03-13 18:30:11 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text 
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
 2014-03-13 11:20:48 -07:00
Baligh Uddin
5969801cc1 am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a60df014e27d9cd57396655b98922394ff7d73bb':
  Import translations. DO NOT MERGE
 2014-03-13 18:02:47 +00:00
Alan Viverette
3782a3a6a1 am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '429720754d85e1b13bc9001adaa23a0b0db04b61':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-13 18:02:19 +00:00
Alan Viverette
b4a50745f2 am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-13 18:02:18 +00:00
Baligh Uddin
a60df014e2 am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:21 +00:00
Baligh Uddin
255034803c am 7c35c10e: (-s ours) Import translations. DO NOT MERGE 
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE
 2014-03-13 16:40:31 +00:00
Przemyslaw Szczepaniak
375545e2fe am 6829c48c: Merge "Fix F/C in TTS settings" 
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
 2014-03-13 15:32:48 +00:00
Przemyslaw Szczepaniak
6829c48c36 Merge "Fix F/C in TTS settings" 2014-03-13 15:26:49 +00:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-13 10:01:45 +00:00