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

15345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jeff Davidson
deb9cf1abb am a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev 
* commit 'a5db8ba5afd669de607cc7db2578927476aed12a':
  Less intrusive VPN dialog.
 2014-08-21 03:02:10 +00:00
PauloftheWest
349f7bcee8 am 8f60bf4c: am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev 
* commit '8f60bf4cadc7381deeb553150a1705b3b31e116b':
  Added a default Bluetooth icon for Bluetooth Preferences.
 2014-08-21 02:56:27 +00:00
PauloftheWest
9b0d876d50 am 98d0f8ca: am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 
* commit '98d0f8ca2d38ba9cc6fd14eee728abed41431038':
  Fixed a Bluetooth Scanning issue.
 2014-08-21 02:48:15 +00:00
Amith Yamasani
05ff676f5c am 6879169f: am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev 
* commit '6879169fe928712e66269c75e0b91135eb675a11':
  Update string for profile owner addition warning
 2014-08-21 02:47:45 +00: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
PauloftheWest
3f6a50ba82 am 0233d732: am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev 
* commit '0233d732eb124a0e09e35e65b630e82a10b5d426':
  Fixed a Settings dialog crash.
 2014-08-21 00:44:36 +00:00
John Spurlock
1189e70be4 am 1bc2ff2b: am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 
* commit '1bc2ff2b3045b793a814ded08becc00d84b40cf8':
  Settings: Remove needless dialogTitle attribute.
 2014-08-21 00:43:56 +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
Jeff Davidson
8a983e438b Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev 2014-08-20 20:15:45 +00:00
PauloftheWest
0233d732eb am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev 
* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
  Fixed a Settings dialog crash.
 2014-08-20 20:12:08 +00:00
John Spurlock
1bc2ff2b30 am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 
* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
  Settings: Remove needless dialogTitle attribute.
 2014-08-20 19:53:04 +00:00
Amith Yamasani
23d8742df6 Merge "Update string for profile owner addition warning" into lmp-dev 2014-08-20 18:43:12 +00:00
Amith Yamasani
2e4489d6c3 Update string for profile owner addition warning 
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
 2014-08-20 13:43:13 -07:00
Jon Miranda
af1d4c7c15 am b96f55f0: am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit 'b96f55f0605db060db8cf4a13b3455f19b5a1ecd':
  Added a developer option to save attribute data.
 2014-08-20 15:38:08 +00:00
Jon Miranda
b96f55f060 am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
  Added a developer option to save attribute data.
 2014-08-20 15:30:30 +00:00
Jessica Hummel
fc8cf67df6 Make string for work profile consistent with provisioning and framework strings. 
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412
 2014-08-20 15:45:53 +01:00
Jeff Brown
966b5fefb7 am 2cd05f71: am ff0e81eb: Declare CAST_SETTINGS activity. 
* commit '2cd05f71230bfdb04abc792e605b0d68befb01ce':
  Declare CAST_SETTINGS activity.
 2014-08-20 03:31:48 +00:00
Jeff Brown
2cd05f7123 am ff0e81eb: Declare CAST_SETTINGS activity. 
* commit 'ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
  Declare CAST_SETTINGS activity.
 2014-08-20 03:19:32 +00:00
Jeff Brown
ff0e81eb09 Declare CAST_SETTINGS activity. 
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.

Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
 2014-08-19 19:44:47 -07:00
Maurice Lam
5cb59e2df6 am 8904061e: am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 
* commit '8904061e66e52491cb0cecb4bb1ade418d254f63':
  [WifiSetup] Change illustration aspect ratio
 2014-08-20 02:44:34 +00:00
Maurice Lam
8904061e66 am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 
* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
  [WifiSetup] Change illustration aspect ratio
 2014-08-20 02:22:21 +00:00