PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,174 Commits 1 Branch 0 Tags
cbcc76e8d32f95690d08258a91d58136cd9fb056
Commit Graph

20174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
6bb9c54a79 Merge "Zen: Move zen mode preference to switch bar." 2015-04-09 16:58:57 +00:00
Ryo Hashimoto
fa54606dc7 Merge "Enable BugreportStorageProvider when bug report is enabled" 2015-04-09 10:26:54 +00:00
Maurice Lam
598be1eab6 Add support for material_blue theme 
Add support for material_blue theme, which setup wizard is going to
use for M. This changes SetupWizardUtils.getTheme to always return
either SetupWizardTheme or SetupWizardTheme_Light, and added the
theme value "material" blue.

Bug: 19729981
Change-Id: I63678312af4942be358b92a58b1c84f89aaaa6c1
 2015-04-08 21:13:42 -07:00
Lifu Tang
3ebd352054 Updated the string resource 
- Removed references to "Google services" (b/20098473)
- Made the link markers untranslatable (b/20097593)
- Updated all strings to final version (b/20128009)

Bug: 20097593
Bug: 20098473
Bug: 20128009
Change-Id: I51ecc6cd8004e6a854053abae8654bc877dcf2a6
 2015-04-08 18:30:59 -07:00
Stuart Scott
83dbf09fb0 Avoid mulitple calls to getActivity. 
Change-Id: I789069d86e268aee5f5a1f961de3d703cd7940a7
 2015-04-08 16:40:16 -07:00
Stuart Scott
f51d006350 Correct the way settings deals with subscriptions. 
Change-Id: I19e9dfaf248fce7376b124ee91de7e73fdc99fb3
 2015-04-08 11:11:34 -07:00
Adrian Roos
c2ab934117 Merge "Allow none lockscreen with multiple users" 2015-04-08 15:24:30 +00:00
Adrian Roos
1951726152 Merge "Hide emergency app settings on non-voice deivces" 2015-04-08 14:50:21 +00:00
Adrian Roos
4157d7fcbb Hide emergency app settings on non-voice deivces 
Bug: 19841649
Change-Id: I30ba582f503514656c99f3aea2801a68dfd1a5fa
 2015-04-08 16:26:47 +02:00
Geoff Mendal
285aa88465 Import translations. DO NOT MERGE 
Change-Id: Ie968e96e3a2420226abd618b77db0f5a03d2ae5e
Auto-generated-cl: translation import
 2015-04-08 08:23:55 -05:00
Fabrice Di Meglio
1f1c302e7e Merge "Settings - add support for Launch by Default - part 2" 2015-04-08 00:32:07 +00:00
Fabrice Di Meglio
e8981e3c58 Settings - add support for Launch by Default - part 2 
UX fixes

- make the ManageApplications list to be able to handle some disable items
- add domain list for App that are not verified

Change-Id: Ib37c6f3f3dd1d1cdc17db434967f583cc89e068c
 2015-04-07 17:13:12 -07:00
Adam Lesinski
75ec17dd92 Merge "Update name of field used from BatterySipper" 2015-04-07 23:51:24 +00:00
Jason Monk
6e338dbe62 Merge "Add runtime permission summary for M apps" 2015-04-07 19:21:42 +00:00
Jason Monk
6137d550b0 Add runtime permission summary for M apps 
Bug: 20104004
Change-Id: I88b7db34e52444a0c23a8f4ccb76e52bbb83f118
 2015-04-07 15:03:57 -04:00
Adam Lesinski
0c9c85a847 Update name of field used from BatterySipper 
Change-Id: Ie7ec921d646b50826d4dfe942bc13ddfc4cd9190
 2015-04-07 11:05:14 -07:00
Pavel Zhamaitsiak
a14fc12a90 Remove "Wi-Fi only" option from Wi-Fi Calling settings 
automerge: a72c266

* commit 'a72c266d5de51188666435ca1fc1e5c2754ef033':
  Remove "Wi-Fi only" option from Wi-Fi Calling settings
 2015-04-07 17:01:17 +00:00
Adrian Roos
591dc85017 Allow none lockscreen with multiple users 
Bug: 19962043
Change-Id: Ic7dcbd371d700bf8796f50469a7ac7d529ec491d
 2015-04-07 16:55:29 +02:00
Adrian Roos
c701a20aed Merge "Fix crash on rotation while ICE dialog is open" 2015-04-07 14:19:51 +00:00
Adrian Roos
e06c34464e Fix crash on rotation while ICE dialog is open 
Bug: 20096049
Change-Id: I90c5d98b26cc55d7178e6c154ff1788ccb4c3974
 2015-04-07 16:05:07 +02:00
Bart Sears
a79c449515 Merge "Revert "Update name of field used from BatterySipper"" 2015-04-07 06:19:49 +00:00
Bart Sears
86c99e28e9 Revert "Update name of field used from BatterySipper" 
Companion CL needed to be reverted as it was breaking the build, so
reverting this CL as well until Adam has a chance to investigate.

This reverts commit a74ddc29b8.

Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88
 2015-04-07 06:15:25 +00:00
Adam Lesinski
a75c2caff7 Merge "Update name of field used from BatterySipper" 2015-04-07 01:53:03 +00:00
Adam Lesinski
a74ddc29b8 Update name of field used from BatterySipper 
This relies on change Ia3d97e0a1c3352127185c18626d8ba8221c9ab40

Change-Id: Ibfb31da3938bf2ff4cf20444e680addabcca9eb3
 2015-04-06 18:21:43 -07:00
Pavel Zhamaitsiak
a72c266d5d Remove "Wi-Fi only" option from Wi-Fi Calling settings 
Bug: 19914582
Change-Id: Iababf6862010812380529440e537958dddbcfdeb
 2015-04-07 00:37:29 +00:00
Lifu Tang
d858ed9784 Merge "Updated system settings to control BLE scanning" 2015-04-06 22:39:40 +00:00
Lifu Tang
c36e1c4e0a Merge "Added links to scanning settings" 2015-04-06 22:39:28 +00:00
Dianne Hackborn
bec3e01143 Merge "Update with new assist app ops." 2015-04-06 20:21:55 +00:00
Lifu Tang
0ac63cdca2 Updated system settings to control BLE scanning 
Bug: 19966182
Change-Id: Ic3f51957629d785017dd92f7a28f78f20e739559
 2015-04-06 11:02:51 -07:00
Lifu Tang
be794c30ca Added links to scanning settings 
Bug: 19918721
Change-Id: Ifb1508807d34b675e9ea1522f86a9310ed6b663f
 2015-04-06 11:00:04 -07:00
Maurice Lam
4e0fc628f0 [Fingerprint] Add fingerprint text in setup flow 
When running in Setup Wizard, the screen to choose screen lock will
have an additional footer, telling the user that they can configure
fingerprint in Settings after completing the setup flow.

Bug: 19690335
Change-Id: Ie6268fb8738e6bbac8751d12b05c82092fe6193b
 2015-04-06 10:09:59 -07:00
Geoff Mendal
83a803c117 Import translations. DO NOT MERGE 
Change-Id: Ibf88a86ea2fa1bfd7f73728de8f712c06ec3b91e
Auto-generated-cl: translation import
 2015-04-06 08:05:34 -05:00
Dianne Hackborn
7781ef6870 Update with new assist app ops. 
Change-Id: I796845dd1cb3ccfe951e0cbdb7cab55ec476f128
 2015-04-04 17:48:18 -07:00
John Spurlock
b47b2c3f6a Zen: Move zen mode preference to switch bar. 
- Add summary line support to SwitchBar.
 - Remove obsolete strings.
 - Wire up switchbar to zen mode w/ dialog prompt.
 - Remove obsolete callback pref helper.

Bug: 20064962
Change-Id: Ifede00b5d43d441ccd94db96bd2796bc57d1a990
 2015-04-04 15:47:43 -04:00
Geoff Mendal
c12b1ab221 Import translations. DO NOT MERGE 
Change-Id: Ic979dd992c6bce9178a743a924cb5c210757408b
Auto-generated-cl: translation import
 2015-04-03 22:54:58 -07:00
John Spurlock
385c5acbd6 Merge "Settings: Move downtime to new automation sub-settings page." 2015-04-03 23:53:04 +00:00
Vinit Deshpande
295793928d Implement 'Available via Passpoint' feature 
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
 2015-04-03 16:42:28 -07:00
Fyodor Kupolov
4d2c022c13 Merge "Support for nested bundles in setApplicationRestrictions" 2015-04-03 22:24:41 +00:00
Fabrice Di Meglio
1152aee9f6 Merge "Settings - add support for Launch by Default" 2015-04-03 21:40:15 +00:00
Fabrice Di Meglio
8b2ea39cbc Settings - add support for Launch by Default 
- implement UX spec

Change-Id: I7ee8962f83983273d809e0ef6fc81b0eb2df15dd
 2015-04-03 14:10:01 -07:00
Alex Klyubin
8019aa6b7b Merge "Make Settings app not use cleartext network traffic." 2015-04-03 20:46:09 +00:00
John Spurlock
d8b3683570 Settings: Move downtime to new automation sub-settings page. 
Bug: 20064962
Change-Id: I6238439bbd679c143fc986743a65ed64057f2755
 2015-04-03 16:27:45 -04:00
John Spurlock
851532f37f Merge "Settings: Move priority configuration to its own sub-settings page." 2015-04-03 20:07:58 +00:00
John Spurlock
48bbd5d1e4 Settings: Move priority configuration to its own sub-settings page. 
Bug: 20064962
Change-Id: Idd03e0e5077e13cc08ff9997ab9ad56ddcdb5c50
 2015-04-03 15:57:21 -04:00
Fyodor Kupolov
2b2ab5a947 Support for nested bundles in setApplicationRestrictions 
Replaced RestrictionUtils.restrictionsToBundle with RestrictionsManager.
convertRestrictionsToBundle.

Bug: 19540606
Change-Id: I32b264e04d5d177ea5b4c39a8ace5ee0ce907970
 2015-04-03 10:19:24 -07:00
Jason Monk
bca21083a3 Merge "Show current screen lock as summary" 2015-04-03 14:56:53 +00:00
John Spurlock
cefa439559 Merge "Settings: Support new alarms-only zen value." 2015-04-03 03:03:51 +00:00
John Spurlock
b5bbff8c97 Settings: Support new alarms-only zen value. 
Bug: 19260237
Change-Id: I57941c0e4df8026cdc36076551770a813800edc8
 2015-04-02 17:46:44 -04:00
Elliott Hughes
abbe2d4c8a am 483d7989: am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone" 
* commit '483d7989deac12ea8ad51e7a0bc227289601fb1a':
  Add Europe/Istanbul timezone
 2015-04-02 18:49:22 +00:00
Alex Klyubin
b009023c76 Make Settings app not use cleartext network traffic. 
This CL switches the only two places which use cleartext HTTP in this
app to HTTPS. It also declares in the AndroidManifest.xml that this
app does not use cleartext network traffic, thus asking the platform
and tools to block any such traffic from this app on best effort
basis.

NOTE: The only test that uses cleartext HTTP traffic is in VpnTests.
This test makes cleartext HTTP requests to a third-party service which
does not appear to support HTTPS. Thus, this CL temporarily relaxes
the cleartext traffic policy during this test to keep it working. The
correct longer-term fix for this test is to use a service that offers
HTTPS.

Bug: 19215516
Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
 2015-04-02 11:30:15 -07:00