Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,740 Commits 1 Branch 0 Tags
7cd216144e540a4eccf24965cc31d3998c28bfc8
Commit Graph

15740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
7cd216144e am 76747ff8: am fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '76747ff8f5bb7981cc3a542095142e59fd72fd00':
  Restore legacy VPN stats dialog.
 2014-08-25 08:23:15 +00:00
Jeff Davidson
76747ff8f5 am fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit 'fc24d0a78071f6e441f236ab69be6642f650f253':
  Restore legacy VPN stats dialog.
 2014-08-23 02:49:04 +00:00
Jeff Davidson
fc24d0a780 am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '8e6edba5606fd717a631aabcc4c5702bdd509033':
  Restore legacy VPN stats dialog.
 2014-08-23 01:12:46 +00:00
Jeff Davidson
8e6edba560 Merge "Restore legacy VPN stats dialog." into lmp-dev 2014-08-23 00:55:40 +00:00
Jim Miller
c35e4fafa3 am 0c5fdd10: am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '0c5fdd10dedf7c3671d19addcea270ed945b92d1':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:54:40 +00:00
Jim Miller
0c5fdd10de am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '86e9f7cd668441dff2a35b046a99ebe8fd0548d9':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:44:56 +00:00
Jim Miller
86e9f7cd66 am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '1351b0fbcddea9cc66941e8af1de148142b92201':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:34:45 +00:00
Jim Miller
1351b0fbcd Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 2014-08-22 22:25:16 +00:00
Elliott Hughes
4ca51a0efa am 76211390: am 21fc35c1: am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev 
* commit '76211390f23e8478327e41591df7b33c03eebe9f':
  Settings psuedolocalization fixes.
 2014-08-22 21:04:59 +00:00
Elliott Hughes
76211390f2 am 21fc35c1: am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev 
* commit '21fc35c128b126a9052c6dca3fbd61d121d646dc':
  Settings psuedolocalization fixes.
 2014-08-22 20:57:16 +00:00
Elliott Hughes
21fc35c128 am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev 
* commit 'd5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
  Settings psuedolocalization fixes.
 2014-08-22 20:51:00 +00:00
Elliott Hughes
d5ee3bc858 Merge "Settings psuedolocalization fixes." into lmp-dev 2014-08-22 20:42:38 +00:00
Jeff Davidson
b2bb1973fe Restore legacy VPN stats dialog. 
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
 2014-08-22 13:12:01 -07:00
Amith Yamasani
17adb55689 am 2cbd9206: am cf4e004e: am 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev 
* commit '2cbd9206cffcfb3d9deb0aeabdd61e5e0b1b4427':
  Switch user on clicking on a user in User Settings
 2014-08-22 19:52:52 +00:00
Amith Yamasani
2cbd9206cf am cf4e004e: am 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev 
* commit 'cf4e004e7dda4bace3ffba1ed6fb53f49c23df06':
  Switch user on clicking on a user in User Settings
 2014-08-22 19:46:53 +00:00
Amith Yamasani
cf4e004e7d am 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev 
* commit '8802ccf853b86ba56816ddd06346812b61e58220':
  Switch user on clicking on a user in User Settings
 2014-08-22 19:41:59 +00:00
Amith Yamasani
8802ccf853 Merge "Switch user on clicking on a user in User Settings" into lmp-dev 2014-08-22 19:37:09 +00:00
Amith Yamasani
f7ba74df59 Switch user on clicking on a user in User Settings 
This slipped out of the code somehow.

Bug: 15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
 2014-08-22 12:33:23 -07:00
Elliott Hughes
c550f0bff4 Settings psuedolocalization fixes. 
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.

Also remove some dead code now zz_ZY and zz_ZZ are gone.

Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
 2014-08-22 12:24:00 -07:00
Baligh Uddin
c2ef0ada7a am c140584b: (-s ours) am 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c140584bef8beda0902cc4e600ab2d1eafbe9e3b':
  Import translations. DO NOT MERGE
 2014-08-22 17:55:48 +00:00
Baligh Uddin
c140584bef am 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '79ace565651e2b220ca60de0f6bcf39d4e4263fd':
  Import translations. DO NOT MERGE
 2014-08-22 17:49:55 +00:00
Baligh Uddin
79ace56565 am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3723625fecf9d1402e4d1747d9342ed12235184e':
  Import translations. DO NOT MERGE
 2014-08-22 17:32:04 +00:00
Baligh Uddin
3f2be99c1d Merge "Import translations. DO NOT MERGE" 2014-08-22 17:24:32 +00:00
Baligh Uddin
3723625fec Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-22 17:24:31 +00:00
Jessica Hummel
da277ed6e3 am 6c86560c: am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings 
* commit '6c86560cad3fc0ab1d198ba3a429f9cb79b15f99':
  Final tweaks to work profile strings
 2014-08-22 15:01:59 +00:00
Jessica Hummel
6c86560cad am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings 
* commit '1da99d2b45f76422b4ca2ab47fa77e32d249dec4':
  Final tweaks to work profile strings
 2014-08-22 14:54:27 +00:00
Jessica Hummel
1da99d2b45 am 2e9e044e: Final tweaks to work profile strings 
* commit '2e9e044ed2c3dbbcd7ce01d2c8b6e00f452cf31b':
  Final tweaks to work profile strings
 2014-08-22 14:42:05 +00:00
Jessica Hummel
2e9e044ed2 Final tweaks to work profile strings 
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:15744182
 2014-08-22 14:06:30 +00:00
Alexandra Gherghina
4810f9b49d am 61d33eb7: am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev 
* commit '61d33eb7b7c4a38e4d53e2de5425f1594715f3fd':
  Update strings for removing work profile
 2014-08-22 13:21:01 +00:00
Alexandra Gherghina
0e895c675e am 6db44b35: am dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev 
* commit '6db44b35db9636c752004597d2148f36984966bf':
  Modify Spinner so that the arrow is closer to the text
 2014-08-22 13:21:00 +00:00
Alexandra Gherghina
61d33eb7b7 am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev 
* commit '70a7c59daaac5b7bf06191443ebb81fe65f06054':
  Update strings for removing work profile
 2014-08-22 13:12:02 +00:00
Alexandra Gherghina
6db44b35db am dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev 
* commit 'dfe2f709c631bf2e819c3f87084948917e920eed':
  Modify Spinner so that the arrow is closer to the text
 2014-08-22 13:12:01 +00:00
Alexandra Gherghina
70a7c59daa am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev 
* commit '9239d6d0a2fd01170b6188a6b92bd716ca962c65':
  Update strings for removing work profile
 2014-08-22 13:01:59 +00:00
Alexandra Gherghina
dfe2f709c6 am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev 
* commit '9c4d5dd86b250dbb0ce9fe5dc9339a7fd7798981':
  Modify Spinner so that the arrow is closer to the text
 2014-08-22 13:01:58 +00:00
Alexandra Gherghina
9239d6d0a2 Merge "Update strings for removing work profile" into lmp-dev 2014-08-22 12:53:29 +00:00
Alexandra Gherghina
9c4d5dd86b Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev 2014-08-22 12:53:19 +00:00
Alexandra Gherghina
4c96267acd Update strings for removing work profile 
Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
 2014-08-22 11:17:31 +01:00
Maurice Lam
c1d149fd35 am 6d1a798c: am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 
* commit '6d1a798ce5e24fa1de63690f93c1d0fe35b2e852':
  [WifiSetup] Tablet portrait layout
 2014-08-22 03:14:02 +00:00
Maurice Lam
6d1a798ce5 am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 
* commit '103c33145c7aa4c784b9e4318e16db8e2aa803bf':
  [WifiSetup] Tablet portrait layout
 2014-08-22 03:00:08 +00:00
Jim Miller
9d25005e7a Show trust agent entries as disabled rather than removing them. 
Fixes bug 17108810

Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
 2014-08-21 19:46:26 -07:00
Maurice Lam
103c33145c am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 
* commit '8be27595766a632da8ef78a0a8eaa8dc041232d8':
  [WifiSetup] Tablet portrait layout
 2014-08-22 01:34:31 +00:00
Maurice Lam
8be2759576 Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 2014-08-22 01:22:25 +00:00
Amith Yamasani
93ed43524d am 727b53ad: am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev 
* commit '727b53adecc436a91cb7333a59152305b93f94cd':
  Fix layout of Apn Settings screen
 2014-08-21 21:23:52 +00:00
Amith Yamasani
727b53adec am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev 
* commit '8cf1ec351f9d1c666219878f2f753fc738e44bc2':
  Fix layout of Apn Settings screen
 2014-08-21 21:13:16 +00:00
Amith Yamasani
8cf1ec351f am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev 
* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
  Fix layout of Apn Settings screen
 2014-08-21 21:03:27 +00:00
Amith Yamasani
2534be3746 Merge "Fix layout of Apn Settings screen" into lmp-dev 2014-08-21 20:51:44 +00:00
Amith Yamasani
ce3cd9df9b Fix layout of Apn Settings screen 
Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
 2014-08-21 13:30:35 -07:00
Kenny Guy
2c7addd8ab am 38afb092: am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 
* commit '38afb092aecc5585d75ef3d5e54129d3600d1ae6':
  Disable non-permitted accessibility services and IMEs
 2014-08-21 18:15:56 +00:00
Kenny Guy
38afb092ae am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 
* commit '100d45ec09da85055c7f5e2019c5aba54e986f37':
  Disable non-permitted accessibility services and IMEs
 2014-08-21 18:05:51 +00:00
Kenny Guy
100d45ec09 am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 
* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
  Disable non-permitted accessibility services and IMEs
 2014-08-21 17:57:32 +00:00