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

15931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
8e4e0e4b84 am 500510ad: am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev 
* commit '500510ad5c6cf60b078c61fc7831c31bd5e521be':
  rename ScanResult.status -> autoJoinStatus
 2014-08-21 15:11:21 +00: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
1cba734580 am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 
* commit 'a477e8910c948ce53b9069e214e51b2a38d69d2f':
  Make string for work profile consistent with provisioning and framework strings.
 2014-08-21 11:44:48 +00: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
389bea96d9 am d925c995: am fe3794a9: Remove "Choose Keyboards" settings 
* commit 'd925c9952dad2302d30b91ddb1dbe0fedd756f7e':
  Remove "Choose Keyboards" settings
 2014-08-21 04:26:38 +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
Jeff Davidson
0003b29cda am b5566ca7: am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev 
* commit 'b5566ca7a9b8c099cc71aedbbb2719dc35c23852':
  Suppress WiFi Assistant card until future platform updates.
 2014-08-21 03:06:21 +00:00