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

15436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
f3aa4abd4b am 38e472df: am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit '38e472df158a553f38f7e1e2ba69e61268709226':
  Add setting to disable automatic USB audio routing
 2014-08-14 05:20:51 +00:00
Michael Wright
18f65206a6 am 3fab6697: am 48ddc94b: am bf55863b: Remove indexes for removed hard keyboard options. 
* commit '3fab6697cc2567e8e8304c3573ea237691accc95':
  Remove indexes for removed hard keyboard options.
 2014-08-14 05:20:50 +00:00
Glenn Kasten
38e472df15 am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit '6a5aad7b2e942cf79c245885e95d3e41dd1f0561':
  Add setting to disable automatic USB audio routing
 2014-08-14 04:20:07 +00:00
Michael Wright
3fab6697cc am 48ddc94b: am bf55863b: Remove indexes for removed hard keyboard options. 
* commit '48ddc94b79ad9d1b831b694d1c2a6c755895dfba':
  Remove indexes for removed hard keyboard options.
 2014-08-14 04:20:02 +00:00
Glenn Kasten
6a5aad7b2e am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'f51dacedd8ccbe99584e05320a92adbb8e95abfe':
  Add setting to disable automatic USB audio routing
 2014-08-13 22:56:05 +00:00
Michael Wright
48ddc94b79 am bf55863b: Remove indexes for removed hard keyboard options. 
* commit 'bf55863b41efc3ad29c752f133f8739aac35d103':
  Remove indexes for removed hard keyboard options.
 2014-08-13 22:41:17 +00:00
Michael Wright
bf55863b41 Remove indexes for removed hard keyboard options. 
Bug: 16027438
Change-Id: If668024e3b7073b49142de7e9aae4a46b4969d40
 2014-08-13 22:06:54 +00:00
Amith Yamasani
8751f0dda9 am ab888021: am 81fa31a1: am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev 
* commit 'ab8880219291ee82a58d08b6d4280c7cf91e6477':
  Allow creating last user even if a guest exists.
 2014-08-13 20:25:41 +00:00
Amith Yamasani
ab88802192 am 81fa31a1: am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev 
* commit '81fa31a104846112c6c7f193ab81a7201ee9914e':
  Allow creating last user even if a guest exists.
 2014-08-13 20:18:51 +00:00
Amith Yamasani
81fa31a104 am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev 
* commit '561d6bc9bb3f1473ac67f4bef5edac7b3046a901':
  Allow creating last user even if a guest exists.
 2014-08-13 20:13:13 +00:00
Paul Lawrence
312ec410f8 am 5ae69f79: am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev 
* commit '5ae69f791947a977bf48a747449f6c0dbea6e04b':
  Bring up factory reset UI when decryption fails but password is correct
 2014-08-13 20:06:02 +00:00
Paul Lawrence
5ae69f7919 am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev 
* commit '3007a85e1136d942c6805c9384688b233565d782':
  Bring up factory reset UI when decryption fails but password is correct
 2014-08-13 20:00:51 +00:00
Jim Miller
aa4d4b7311 am ad0a630b: am a063a84c: am 5a10a8df: Use SwitchPreference in TrustAgentSettings. 
* commit 'ad0a630bac1411914091483ac0950961f2d60d27':
  Use SwitchPreference in TrustAgentSettings.
 2014-08-13 20:00:42 +00:00
Paul Lawrence
3007a85e11 am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev 
* commit 'd6d0cd53d00a84619f3f90761ee3907732fac898':
  Bring up factory reset UI when decryption fails but password is correct
 2014-08-13 19:55:41 +00:00
Jim Miller
ad0a630bac am a063a84c: am 5a10a8df: Use SwitchPreference in TrustAgentSettings. 
* commit 'a063a84ce26092001cdded38b416b13dc073fde4':
  Use SwitchPreference in TrustAgentSettings.
 2014-08-13 19:53:10 +00:00
Jim Miller
a063a84ce2 am 5a10a8df: Use SwitchPreference in TrustAgentSettings. 
* commit '5a10a8df0efcf034077cbfcd28dd2e495b8d0441':
  Use SwitchPreference in TrustAgentSettings.
 2014-08-13 19:48:21 +00:00
Jim Miller
5a10a8df0e Use SwitchPreference in TrustAgentSettings. 
Fixes bug 16900059

Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
 2014-08-13 19:43:20 +00:00
Jason Monk
cdd8b8e940 am f56c9664: am 4ee07862: am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev 
* commit 'f56c9664bd4c53a94c870bcab284589264abd196':
  Handle default properly to avoid scary logging.
 2014-08-13 17:46:54 +00:00
Jason Monk
f56c9664bd am 4ee07862: am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev 
* commit '4ee07862cbadeb782fbe598e7f334984070d6c5e':
  Handle default properly to avoid scary logging.
 2014-08-13 17:38:55 +00:00
Jason Monk
4ee07862cb am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev 
* commit 'b37ad3d0e903a602272c8ce6e5c51630b5ca063b':
  Handle default properly to avoid scary logging.
 2014-08-13 17:35:10 +00:00
PauloftheWest
e3d4ec2087 am 95ff67d5: am fa575c5c: am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev 
* commit '95ff67d500df1a9f9204c590bc3529dcf9f126a2':
  Changed PBAP's default permission from allow to UNKNOWN.
 2014-08-13 17:26:27 +00:00
PauloftheWest
95ff67d500 am fa575c5c: am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev 
* commit 'fa575c5c5fb4cd00a18c786574b8464786436cce':
  Changed PBAP's default permission from allow to UNKNOWN.
 2014-08-13 17:21:14 +00:00
PauloftheWest
fa575c5c5f am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev 
* commit 'd8e08e55cd6669f5c576b58d8ed7c79ff27c8fa6':
  Changed PBAP's default permission from allow to UNKNOWN.
 2014-08-13 17:16:55 +00:00
Amith Yamasani
561d6bc9bb Merge "Allow creating last user even if a guest exists." into lmp-dev 2014-08-13 16:52:03 +00:00
Paul Lawrence
d6d0cd53d0 Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev 2014-08-13 16:52:03 +00:00
PauloftheWest
eda2292101 am 22e3dbac: am 4fae753d: am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev 
* commit '22e3dbac1beb126849b2636741a05c9a7ec2f47a':
  Revert "Add BT message access"
 2014-08-13 14:52:43 +00:00
PauloftheWest
22e3dbac1b am 4fae753d: am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev 
* commit '4fae753ddb496d6e7f5b6729da2113f384266dec':
  Revert "Add BT message access"
 2014-08-13 14:48:39 +00:00
PauloftheWest
4fae753ddb am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev 
* commit 'e1fd76a85bf86fe5cd6637d3fdfe6420283395ed':
  Revert "Add BT message access"
 2014-08-13 14:46:02 +00:00
Dianne Hackborn
5d46fbe6f7 am 017c0382: am a6d49645: am b51253cf: Add action targets for voice input and usage access settings. 
* commit '017c03822a843003777f3850f35fbace1b00c9bf':
  Add action targets for voice input and usage access settings.
 2014-08-13 05:20:42 +00:00
Dianne Hackborn
017c03822a am a6d49645: am b51253cf: Add action targets for voice input and usage access settings. 
* commit 'a6d496455317372a6d3f134e38e89dbcf4c059c8':
  Add action targets for voice input and usage access settings.
 2014-08-13 04:29:01 +00:00
Dianne Hackborn
a6d4964553 am b51253cf: Add action targets for voice input and usage access settings. 
* commit 'b51253cfed0796b20e03a104aaca4d8d3e2d3024':
  Add action targets for voice input and usage access settings.
 2014-08-13 02:09:14 +00:00
Dianne Hackborn
b51253cfed Add action targets for voice input and usage access settings. 
Change-Id: I5ea0b34ed440b2cfdce0c63e2c4976c89202eb64
 2014-08-12 18:22:06 -07:00
Jason Monk
b37ad3d0e9 Merge "Handle default properly to avoid scary logging." into lmp-dev 2014-08-12 23:14:49 +00:00
Jason Monk
b08853aad9 Handle default properly to avoid scary logging. 
Lock-to-app enabled should default to false and not bother logging
about it not being set yet.

Bug: 16958525
Change-Id: If0d595107d4d40a62ac5d2cc461a8aa18ff80e19
 2014-08-13 13:09:31 -04:00
PauloftheWest
e1fd76a85b Merge "Revert "Add BT message access"" into lmp-dev 2014-08-12 23:14:49 +00:00
Glenn Kasten
f51dacedd8 Merge "Add setting to disable automatic USB audio routing" into lmp-dev 2014-08-12 23:14:35 +00:00
Glenn Kasten
ca54234efc Add setting to disable automatic USB audio routing 
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
 2014-08-13 11:04:25 -07:00
PauloftheWest
d8e08e55cd Merge "Changed PBAP's default permission from allow to UNKNOWN." into lmp-dev 2014-08-12 23:14:35 +00:00
Fabrice Di Meglio
e6cbb374f5 am 35513c62: am ba11d0e9: am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971 
* commit '35513c6258abfa84925cf5ac413fa51bf4774715':
  Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
 2014-08-12 22:19:10 +00:00
Fabrice Di Meglio
35513c6258 am ba11d0e9: am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971 
* commit 'ba11d0e9c3137a9a0ca3cc37708ded32e03627f9':
  Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
 2014-08-12 22:13:35 +00:00
Fabrice Di Meglio
ba11d0e9c3 am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971 
* commit '9dc5f80874709866500744a48d8cf5d734688aaf':
  Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
 2014-08-12 22:08:09 +00:00
Fabrice Di Meglio
9dc5f80874 Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971 
- remove the indexing offending part from InputMethodAndLanguageSettings as the strings
has been changed
- add indexing for VoiceInputSettings

Change-Id: Ib8da55c935e00538ad6fff2f2590b0d525140734
 2014-08-12 22:01:01 +00:00
PauloftheWest
58938ba0d6 Changed PBAP's default permission from allow to UNKNOWN. 
Bug: 16956658
Change-Id: Ib08bb873a22b8f6b3fb25172aa8612a132257d66
 2014-08-12 14:50:10 -07:00
PauloftheWest
f8cdcbf19c Revert "Add BT message access" 
- removed Message Access screen from Bluetooth overflow

Bug: 15720425
Change-Id: I68191a4639ea7e6b6cd3a60e88160443fab2ba0e
 2014-08-12 14:18:35 -07:00
Maurice Lam
b449417d8a am 40543dcb: am a12d7ba2: am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev 
* commit '40543dcb8bef6b2d44b87e0c78860dfa894a0034':
  [WifiSetup] Fix colors during setup
 2014-08-12 20:33:03 +00:00
PauloftheWest
8fb9053d1c am 675c02ca: am fb070ed7: am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev 
* commit '675c02ca0deb9991198ee1a10d978298179dce85':
  Added WiFi Assistant settings.
 2014-08-12 20:33:00 +00:00
Maurice Lam
40543dcb8b am a12d7ba2: am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev 
* commit 'a12d7ba2dab5d9db4d26b8dd6f91b61c11337dbd':
  [WifiSetup] Fix colors during setup
 2014-08-12 20:28:11 +00:00
PauloftheWest
675c02ca0d am fb070ed7: am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev 
* commit 'fb070ed76e0d9b00891069c2846ebd80f199b648':
  Added WiFi Assistant settings.
 2014-08-12 20:28:10 +00:00
Maurice Lam
a12d7ba2da am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev 
* commit 'aea9ae000441940842ba3ec9f93562b684eb9053':
  [WifiSetup] Fix colors during setup
 2014-08-12 20:25:21 +00:00
PauloftheWest
fb070ed76e am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev 
* commit 'cccc5defd61d836af3b4d3dbaa8edb4928f2a031':
  Added WiFi Assistant settings.
 2014-08-12 20:25:21 +00:00