Julia Reynolds
7138ed7404
Merge "Supress menu if screen ought to be hidden." into lmp-dev
2014-08-16 03:51:48 +00:00
Lifu Tang
72bd4d252d
Merge "Dim the preference icons when its disabled" into lmp-dev
2014-08-19 15:47:37 +00:00
Julia Reynolds
6cc7cccf11
Supress menu if screen ought to be hidden.
...
Bug: 14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4
2014-08-18 16:04:48 -04:00
Lifu Tang
db0b7637fa
Dim the preference icons when its disabled
...
- Fix b/16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
2014-08-18 11:22:13 -07:00
Christopher Tate
568eeca569
Disallow downgrade of bundled home apps
...
Bug 14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
2014-08-15 15:36:56 -07:00
Baligh Uddin
2719eebfc5
am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
2014-08-15 22:36:02 +00:00
Jeff Davidson
90b3b211ef
Less intrusive VPN dialog.
...
Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.
Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
2014-08-15 15:00:50 -07:00
Jim Miller
23c76e38ef
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
2014-08-15 21:23:40 +00:00
Jim Miller
6a0c89743c
Remove temporary workaround for GMS TrustAgent while API changed.
...
Fixes bug 16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
2014-08-15 14:30:01 -07:00
Fabrice Di Meglio
4325f80808
Update NFC to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
2014-08-15 14:28:04 -07:00
Baligh Uddin
b3b647054e
Import translations. DO NOT MERGE
...
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
2014-08-15 14:21:56 -07:00
arete
300e920f66
Keep SwitchPreference status until user makes choice in confirmation dialog.
...
Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
2014-08-15 20:49:44 +00:00
Fabrice Di Meglio
e3bced2cda
Update Airplane mode to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
2014-08-15 20:36:29 +00:00
Glenn Kasten
2be2a8a47f
Merge "Increase character limit for translation" into lmp-dev
2014-08-15 18:56:10 +00:00
Glenn Kasten
042a9a0bab
Increase character limit for translation
...
Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
2014-08-15 13:24:45 -07:00
Maurice Lam
cd93d14130
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
2014-08-15 18:50:14 +00:00
Maurice Lam
8d449a0e36
[WifiSetup] Use framework AutoMirrored
...
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
2014-08-15 12:54:33 -07:00
Julia Reynolds
fad2b09db8
Merge "Disable disable button according to user restrictions." into lmp-dev
2014-08-15 19:14:43 +00:00
John Spurlock
a7f8addd09
Settings: Update to follow NotificationManager aidl change.
...
Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
2014-08-15 15:06:43 +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
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
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
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
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
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
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
Jim Miller
5a10a8df0e
Use SwitchPreference in TrustAgentSettings.
...
Fixes bug 16900059
Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
2014-08-13 19:43:20 +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
841f760fd7
Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
2014-08-12 23:14:35 +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
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
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
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
arete
ce543836ce
Change checkboxes to switches in "Settings->Backup&Reset"
...
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3
Bug: 16982604
2014-08-14 19:57:50 +00:00
PauloftheWest
d8e08e55cd
Merge "Changed PBAP's default permission from allow to UNKNOWN." into lmp-dev
2014-08-12 23:14:35 +00:00
PauloftheWest
e1fd76a85b
Merge "Revert "Add BT message access"" into lmp-dev
2014-08-12 23:14:49 +00: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