PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,770 Commits 1 Branch 0 Tags
531ed5848be1883e4e7e46176e55bcab32ece468
Commit Graph

15770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
531ed5848b am 64988f9a: am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit '64988f9a5022a3e0458416cc829fbdec267b5edd':
  Honor hide pattern on crypto screen
 2014-08-26 10:17:15 +00:00
Paul Lawrence
64988f9a50 am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ef0a4938a01f4d553d7513df33fa097c56543b7e':
  Honor hide pattern on crypto screen
 2014-08-26 04:54:05 +00:00
Paul Lawrence
ef0a4938a0 am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
  Honor hide pattern on crypto screen
 2014-08-25 22:09:41 +00:00
Paul Lawrence
ee2a85c7c8 Merge "Honor hide pattern on crypto screen" into lmp-dev 2014-08-25 21:59:27 +00:00
PauloftheWest
3aeb60dc58 am 687d3a58: am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '687d3a589ea6a9a259454ea7e139143d4d988f91':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:18:52 +00:00
PauloftheWest
687d3a589e am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '87d8074a1480d10804ada3507c5536be362b77c1':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:04:47 +00:00
Baligh Uddin
274ca40fd0 am 0a0a0966: (-s ours) am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0a0a0966de99949bbacc8064563714670369bfa2':
  Import translations. DO NOT MERGE
 2014-08-25 16:58:32 +00:00
PauloftheWest
87d8074a14 am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 16:55:21 +00:00
Baligh Uddin
0a0a0966de am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd9960178fda7184223cbc56c5dc11128ab1124b0':
  Import translations. DO NOT MERGE
 2014-08-25 16:51:07 +00:00
PauloftheWest
aa5c7565e4 Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 2014-08-25 16:44:25 +00:00
Baligh Uddin
d9960178fd am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
  Import translations. DO NOT MERGE
 2014-08-25 16:32:55 +00:00
Baligh Uddin
cef6b220d6 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:21:03 +00:00
PauloftheWest
a39ccf6bdb am 79ad7235: am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '79ad7235257bf6e6f04cc4f8f594176c938dc3a0':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 16:19:10 +00:00
PauloftheWest
79ad723525 am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 16:12:08 +00:00
PauloftheWest
1c649f7f9b am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 15:58:29 +00:00
PauloftheWest
7560e22d76 Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 2014-08-25 15:48:16 +00:00
PauloftheWest
656c88cb71 Updated Tethering and portable hotspot to use switches. 
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
 2014-08-25 08:45:05 -07:00
PauloftheWest
893be9cc34 Tapping a connected Bluetooth device now presents its settings dialog. 
Bug: 14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
 2014-08-25 15:40:56 +00:00
Dianne Hackborn
6a6d1d7ee5 am 6d98f8e1: am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit '6d98f8e1cbe23348c43a981d37d6b75fcfe99867':
  Tweak voice settings strings.
 2014-08-25 08:25:08 +00:00
Amith Yamasani
b5ba4afdca am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit 'cb7b83de42b13b55030f5d0207f42fcc9e346968':
  Don't index the ChooseLockGeneric screen
 2014-08-25 08:24:10 +00:00
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
Baligh Uddin
aea96bdfb0 Import translations. DO NOT MERGE 
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
 2014-08-24 13:07:11 -07:00
Dianne Hackborn
6d98f8e1cb am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit 'b1391d84fe181e64f486cd176d58d835b0fe6a5e':
  Tweak voice settings strings.
 2014-08-24 19:09:24 +00:00
Dianne Hackborn
b1391d84fe am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit 'c436b159534240c64281447860a81e519bf7c07d':
  Tweak voice settings strings.
 2014-08-24 18:59:46 +00:00
Dianne Hackborn
c436b15953 Merge "Tweak voice settings strings." into lmp-dev 2014-08-24 18:53:17 +00:00
Dianne Hackborn
7912a76cd2 Tweak voice settings strings. 
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
 2014-08-23 14:11:12 -07:00
Amith Yamasani
cb7b83de42 am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit '7728710183de887be3bb68c4f95509659a950428':
  Don't index the ChooseLockGeneric screen
 2014-08-23 06:19:09 +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
Amith Yamasani
7728710183 am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit '8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
  Don't index the ChooseLockGeneric screen
 2014-08-23 01:21:51 +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
Amith Yamasani
8fe710682a Merge "Don't index the ChooseLockGeneric screen" into lmp-dev 2014-08-23 01:07:03 +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
Amith Yamasani
644907a86f Don't index the ChooseLockGeneric screen 
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.

Instead, add some of the relevant keywords up one level in Security
settings.

Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
 2014-08-22 15:38:16 -07: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