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

15484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
PauloftheWest
e0a0fa7cec am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev 
* commit '98f61b71ac182d87256ea21e770b57c1168d1472':
  Fixed a crash when sharing video through Bluetooth.
 2014-08-21 16:31:05 +00:00
PauloftheWest
98f61b71ac Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev 2014-08-21 16:24:11 +00:00
Kenny Guy
333f2bc71a Disable non-permitted accessibility services and IMEs 
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
 2014-08-21 17:15:49 +01:00
PauloftheWest
b358f6d0f2 Fixed a crash when sharing video through Bluetooth. 
+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.

Bug: 17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
 2014-08-21 08:18:30 -07:00
vandwalle
500510ad5c am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev 
* commit '10673f1a1e330cf20ddab04fbc09cce3f18d111d':
  rename ScanResult.status -> autoJoinStatus
 2014-08-21 15:02:24 +00:00
vandwalle
10673f1a1e Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev 2014-08-21 14:55:45 +00:00
Alexandra Gherghina
75783290b6 Modify Spinner so that the arrow is closer to the text 
Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
 2014-08-21 12:44:55 +01:00
Jessica Hummel
a477e8910c am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 
* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
  Make string for work profile consistent with provisioning and framework strings.
 2014-08-21 11:35:04 +00:00
Jessica Hummel
ff2da2cdb3 Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d925c9952d am fe3794a9: Remove "Choose Keyboards" settings 
* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
  Remove "Choose Keyboards" settings
 2014-08-21 04:15:26 +00:00
Maurice Lam
1677b3e3d4 [WifiSetup] Tablet portrait layout 
Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
 2014-08-20 20:36:03 -07:00
Tadashi G. Takaoka
fe3794a937 Remove "Choose Keyboards" settings 
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
 2014-08-21 11:41:57 +09:00
Jeff Davidson
b5566ca7a9 am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev 
* commit '8a983e438bbc0e851471b9d58f44778584a67075':
  Suppress WiFi Assistant card until future platform updates.
 2014-08-21 00:56:07 +00:00
Jeff Davidson
a5db8ba5af am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev 
* commit '4e064343b35cfa6a7615e453c1f6bcf96397e414':
  Less intrusive VPN dialog.
 2014-08-21 00:09:47 +00:00
Diego Pontoriero
ff9f67dddd Change CARRIER_SETUP hook in WirelessSettings to use aeroshell 
for determining carrier app instead of MCC/MNC.

Related WirelessSettings change: http://ag/374330

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
 2014-08-20 16:44:46 -07:00
PauloftheWest
8f60bf4cad am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev 
* commit 'e847e7ef56561bf7ac824d4e5aa742be08f92624':
  Added a default Bluetooth icon for Bluetooth Preferences.
 2014-08-20 22:10:17 +00:00
Jeff Davidson
4e064343b3 Merge "Less intrusive VPN dialog." into lmp-dev 2014-08-20 21:39:11 +00:00
PauloftheWest
e847e7ef56 Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev 2014-08-20 21:39:11 +00:00
PauloftheWest
5badff7622 Added a default Bluetooth icon for Bluetooth Preferences. 
Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
 2014-08-20 14:48:38 -07:00
PauloftheWest
98d0f8ca2d am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 
* commit 'd251fba2fe308ea6aa18002c92506fca9d53848d':
  Fixed a Bluetooth Scanning issue.
 2014-08-20 21:17:34 +00:00
vandwalle
1dfdcdb470 rename ScanResult.status -> autoJoinStatus 
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3

Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
 2014-08-20 21:11:18 +00:00
Amith Yamasani
6879169fe9 am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev 
* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
  Update string for profile owner addition warning
 2014-08-20 21:08:26 +00:00
PauloftheWest
27bd00ba27 Entering Bluetooth in Settings will always initiate a scan. 
Bug: 17060518
Change-Id: I4ba13097f664b4a758ba714f423fa8b34af60ce6
 2014-08-20 13:23:49 -07:00
Jeff Davidson
8a983e438b Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev 2014-08-20 20:15:45 +00:00