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

15730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
df8ee1bb6c Merge "Import translations. DO NOT MERGE" 2014-08-15 04:54:19 +00:00
Baligh Uddin
86370f5dfd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-15 04:38:54 +00:00
Fabrice Di Meglio
0ff107e384 Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 2014-08-15 04:37:53 +00:00
Fabrice Di Meglio
61a1fec49f Fix bug #16703191 APN settings shows back button even when you intent into it 
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment

Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
 2014-08-15 11:36:31 -07:00
Maurice Lam
2d57c4705d am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit '3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
  [WifiSetup] Update illustrations
 2014-08-15 02:55:34 +00:00
Jim Miller
adf9341125 am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit 'bbce34d9be421effb055fbf1a945ec49dfeef02d':
  API review - move confirm credential constants from Intent
 2014-08-15 01:37:29 +00:00
Selim Gurun
63b671c84b am ce8d3910: Remove logic to read the key from GServices 
* commit 'ce8d39103f51eb418cad61ee3e0a80445307e46a':
  Remove logic to read the key from GServices
 2014-08-15 00:08:38 +00:00
PauloftheWest
1cff659ed7 am 8542d9d2: am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit '8542d9d27f1e4c51227f71ce1997776f2b4a4114':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:42:48 +00:00
Zoltan Szatmary-Ban
afa437f3cc am 308bad0e: am 327a50e5: am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '308bad0e169753b821a5f411f1eb5562767fa3f7':
  Fix app icons on some Settings screens
 2014-08-14 23:42:47 +00:00
PauloftheWest
8542d9d27f am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit 'fd002cf07972b29e4ad5980ec12891b7200b8e91':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:34:44 +00:00
Zoltan Szatmary-Ban
308bad0e16 am 327a50e5: am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '327a50e5c01eed62d86187457a206293fb199614':
  Fix app icons on some Settings screens
 2014-08-14 23:34:18 +00:00
Selim Gurun
ce8d39103f Remove logic to read the key from GServices 
Bug: 12492817

The key is now stored in webview apk so remove the logic
to read from GServices.

Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
 2014-08-14 15:44:45 -07:00
arete
f1fd693751 am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit '17224826f896278de0805e6a2fec321701bbb83d':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-14 21:52:22 +00:00
arete
17224826f8 Cannot cancel in the "Warn app installation" dialog in security settings. 
Bug: 16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
 2014-08-14 21:45:04 +00:00
Adam Powell
7660042fa2 am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit 'aa772c9521529d6235aa7be0fb81e75a334c4b82':
  Use material alert dialog item view layout
 2014-08-14 20:29:17 +00:00
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
Zoltan Szatmary-Ban
5e853f5f0a am 70bd3004: am 7c236400: am f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev 
* commit '70bd30045277feecc95ee67b6a243f87071f1bb5':
  Remove spinner in Settings > VPN
 2014-08-14 18:10:06 +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
Zoltan Szatmary-Ban
70bd300452 am 7c236400: am f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev 
* commit '7c2364005e18ebea6ed50a2156fd2b1a22e95c6f':
  Remove spinner in Settings > VPN
 2014-08-14 18:03:17 +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
Amith Yamasani
18511b32ed am 69400ffd: am c8eff56e: am e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev 
* commit '69400ffddc327a620abb49fc0ca3257288b9e3e6':
  Make sure profile owner is system app
 2014-08-14 17:55:38 +00:00
Amith Yamasani
69400ffddc am c8eff56e: am e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev 
* commit 'c8eff56e94cc3fdf3f52055af45e3b2b3ec8b422':
  Make sure profile owner is system app
 2014-08-14 17:45:33 +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
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