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

15996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nancy Chen
db848a5de6 API Review PhoneManager -> TelecommManager. Rename methods (3/6) 
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
 2014-08-22 15:12:01 -07: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
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
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
3723625fec Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-22 17:24:31 +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
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
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
Paul Lawrence
0f11e15f50 Honor hide pattern on crypto screen 
Also clear pattern a little more quickly, and show owner info
even from before encrypting (since we're fixing pattern visible,
we should fix owner info too in the same way)

Bug: 17059314

Change-Id: Ie9ccd4a892a1dec32ebe60567d3b72dd6fe25060
 2014-08-21 15:41:42 -07: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
PauloftheWest
2b41c90fed Removed the Wi-Fi icon shown when Wi-Fi is off. 
Bug: 16570104
Change-Id: Iacee07c225f6609b92f1df193b682fde0a720a92
 2014-08-21 11:57:29 -07: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
Kenny Guy
66b0d9e809 Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 2014-08-21 17:44:25 +00:00
Diego Pontoriero
cac56aa307 am ab3da46a: am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev 
* commit 'ab3da46ac1ee1ec3bdfe0d58b510095f9626b1b5':
  Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
 2014-08-21 16:52:19 +00:00
PauloftheWest
c4f3ee7b27 am e0a0fa7c: am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev 
* commit 'e0a0fa7cec8a91a15c72468f6fa42bbe67a31493':
  Fixed a crash when sharing video through Bluetooth.
 2014-08-21 16:41:58 +00:00
Diego Pontoriero
ab3da46ac1 am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev 
* commit 'dbfd04d80abb4bb605ebd517d52137108cc24d6d':
  Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
 2014-08-21 16:41:56 +00:00
Diego Pontoriero
dbfd04d80a Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev 2014-08-21 16:34:37 +00:00