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

15802 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
Amith Yamasani
c8eff56e94 am e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev 
* commit 'e73b8ccf37470869e8acb00946c95737a44d54d0':
  Make sure profile owner is system app
 2014-08-13 23:32:17 +00:00
Maurice Lam
3d8dd19c85 Merge "[WifiSetup] Update illustrations" into lmp-dev 2014-08-13 23:16:37 +00:00
Maurice Lam
d650726b44 [WifiSetup] Update illustrations 
Update illustration assets and support for auto-mirroring for RTL
languages.

Bug: 16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
 2014-08-14 17:48:08 -07:00
Jim Miller
bbce34d9be Merge "API review - move confirm credential constants from Intent" into lmp-dev 2014-08-13 23:16:37 +00:00
Jim Miller
75fe9e027c API review - move confirm credential constants from Intent 
Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
 2014-08-13 17:03:50 -07:00
Paul Lawrence
ad8bd85d7a Fix encryption strings 
Bug: 16901855
Change-Id: I7297a88c173d5a5ca03ee404938c9d4bad550110
 2014-08-13 16:02:57 -07: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
Zoltan Szatmary-Ban
f8be13d8ca Merge "Remove spinner in Settings > VPN" into lmp-dev 2014-08-12 23:14:49 +00:00
Zoltan Szatmary-Ban
1e6653a1b5 Remove spinner in Settings > VPN 
This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209

Bug:16030111
Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
 2014-08-13 11:11:42 +01: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
Adam Powell
aa772c9521 Merge "Use material alert dialog item view layout" into lmp-dev 2014-08-12 23:14:35 +00:00
Adam Powell
c17bdbf849 Use material alert dialog item view layout 
Bug 16552638

Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
 2014-08-14 13:11:31 -07:00
PauloftheWest
841f760fd7 Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 2014-08-12 23:14:35 +00:00
PauloftheWest
bc976a017e Fixed a bug were secure Wi-Fi connections would show unsecured. 
- Also removed secure summary code as the UX teams has determined it is
  superfluous.

Bug: 16297100
Change-Id: Ib02bc2c0433f5354a8f8cf01f4d8785762a762ad
 2014-08-13 14:55:00 -07:00
Amith Yamasani
e73b8ccf37 Merge "Make sure profile owner is system app" into lmp-dev 2014-08-12 23:14:35 +00:00
Amith Yamasani
080f8db85c Make sure profile owner is system app 
For cases where an app wants to become the profile owner after
setup has completed, make sure that it is a system app.

Bug: 17004847
Change-Id: I88249f1ce3bf841ca4d87f33acfd07a7db906332
 2014-08-13 16:18:33 -07:00
Glenn Kasten
f51dacedd8 Merge "Add setting to disable automatic USB audio routing" into lmp-dev 2014-08-12 23:14:35 +00:00