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
arete
943a1877e6 am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit 'ce543836cea5887484026837f0a4181dca04a733':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-14 20:24:39 +00:00
arete
ce543836ce Change checkboxes to switches in "Settings->Backup&Reset" 
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3

Bug: 16982604
 2014-08-14 19:57:50 +00:00
Fabrice Di Meglio
0147d813ed am d83b3c2a: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit 'd83b3c2a39e4716b4a4276b8b8ce0db2b9a62b9e':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-14 18:08:51 +00:00
Fabrice Di Meglio
d83b3c2a39 Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. 
SettingsPreferenceFragment$1@273c8fdb was not registered

- add override for onUnbindPreferences() that will unregister the observer
if needed
- keep track of the root adapter so that we can unregister / register with
the correct one (by having a new PreferenceScreen the root adapter would not
be the same and thus unregistering the Observer on the new one would not work
and create the current bug)

Change-Id: I2cef0398c2ae0ab4f5ffd67ca20e8874be997bf6
 2014-08-14 18:01:42 +00:00
Julia Reynolds
d093c9f059 Disable disable button according to user restrictions. 
Bug: 16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
 2014-08-14 17:34:41 +00:00
PauloftheWest
fd002cf079 am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit '841f760fd7345ef2d84b9409c27e36c2365a3de4':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 15:43:59 +00:00
Zoltan Szatmary-Ban
327a50e5c0 am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '3aaf0eb457639b52228143b84d9624bf73d862ea':
  Fix app icons on some Settings screens
 2014-08-14 13:06:08 +00:00
Zoltan Szatmary-Ban
7c2364005e am f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev 
* commit 'f8be13d8ca29a61a97411d9d30cb4b82bb669bcf':
  Remove spinner in Settings > VPN
 2014-08-14 09:55:19 +00:00
Zoltan Szatmary-Ban
3aaf0eb457 Fix app icons on some Settings screens 
App icons appeared as the default icon and sometimes without the corp badge on
Data Usage and Battery screens for applications that were only installed for
the managed profile. This CL fixes the issue.

Bug:16705204
Change-Id: I778d36554feb19f28f3cb9321a291cab3d3e17bb
 2014-08-14 09:51:58 +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
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
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
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
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
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
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
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
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
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
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
Maurice Lam
aea9ae0004 Merge "[WifiSetup] Fix colors during setup" into lmp-dev 2014-08-12 20:02:46 +00:00