Commit Graph

19663 Commits

Author SHA1 Message Date
Adrian Roos
ca59f4ffb3 Merge "Disable trust agent settings when disabled by policy" 2015-04-14 00:32:35 +00:00
Adrian Roos
088de47aa8 Disable trust agent settings when disabled by policy
Bug: 19868604
Change-Id: Ie476be0338da399a6bc2d20953f6f005ae5eb423
2015-04-13 17:14:41 -07:00
Barnaby James
dfb369d43f Merge "Add activities to support voice settings." 2015-04-14 00:14:26 +00:00
John Spurlock
2132cedb94 Merge "Settings: External automatic rule settings." 2015-04-13 23:14:53 +00:00
Fyodor Kupolov
ad0a79c1ba Merge "Updated user_add_user_message_long" 2015-04-13 23:13:57 +00:00
Fyodor Kupolov
4a6adbbcbb Updated user_add_user_message_long
Bug: 19629022
Change-Id: I720edfca31cd2d1f6844ef177823e5639383d999
2015-04-13 16:11:19 -07:00
Jorim Jaggi
94573125d5 Merge "Update confirm device credentials to spec, add fingerprint" 2015-04-13 22:01:21 +00:00
Jorim Jaggi
8a09b619ae Update confirm device credentials to spec, add fingerprint
- New strings in the screen.
- New layout/style.
- Clean up internal API's around it.
- Add fingerprint support if launched from externally
- Separate theme if launched from externally
- If launched from above Keyguard, use SHOW_WHEN_LOCKED flag

Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f
2015-04-13 14:59:26 -07:00
Barnaby James
c55ea15bc0 Add activities to support voice settings.
Adds Voice Interaction Activities for:
- Do not disturb mode (with interaction)
- Battery Saver mode
- Airplane mode

Change-Id: I4480dc3a30975d94b71714ff58fbeebddfbc1c58
2015-04-13 14:38:51 -07:00
Stuart Scott
cdba01b119 Correct strings for reset network settings.
bug:16161518
Change-Id: I32242d64cae27b933186a7d0573b6d863ef3efaf
2015-04-13 12:46:19 -07:00
Jason Monk
b5aa73f46f Fix loading screens for manage and running apps
Also add loading screen to manage permissions as this can take a
long time to load in some circumstances. Build loading screens into
Utils and SettingsPreferenceFragment so that it can be easily used
other places in the future.

Change-Id: I7febd06695487e02ced793a9fd418051b5f0eab8
2015-04-13 14:23:37 -04:00
John Spurlock
5f937152a5 Merge "Settings: Mark string reference as untranslatable." 2015-04-13 17:04:04 +00:00
John Spurlock
86aaf7f091 Settings: Mark string reference as untranslatable.
Bug: 20175103
Change-Id: I8bee006ae20a972b345178332ab240571851b8bf
2015-04-13 13:01:55 -04:00
Alan Viverette
12db27c97e Merge "Wrap tintable icons with correctly tinted drawable XML" 2015-04-13 16:31:46 +00:00
Jeff Sharkey
415e8ec42c Merge "CleanSpec!" 2015-04-13 16:22:23 +00:00
Jeff Sharkey
fc3bd5c0c2 CleanSpec!
Change-Id: I2e8a01fa14aeea4b8f9af83deab31b5d136d4120
2015-04-13 09:21:39 -07:00
John Spurlock
c96a5dcbfc Settings: External automatic rule settings.
- Add external automatic rule settings page with the common
   settings for all rules (enabled, name, zen mode).
 - Pull common rule-instance settings into settings base class, share
   with existing schedule rule settings.
 - New page not searchable since it is at the rule-instance level.
 - Obtain external rule information from existing conditions provider
   metadata.  Includes rule type caption, sub-configuration activity,
   and default condition id.
 - If external condition providers exist with the appropriate metadata,
   display the external rule types as options in the new rule dialog.
   (max of 3 external types)
 - Pull common managed service listing code out of common settings base
   class and into a more reusable helper class.

Bug: 20064962
Change-Id: Ibc13607490b7312a7d9f7f3bd61c3cfcf71a2794
2015-04-13 12:19:55 -04:00
John Spurlock
3b1a4c6cc2 Merge "Settings: Remove more obsolete strings." 2015-04-13 15:36:58 +00:00
John Spurlock
a50ce2ce6f Settings: Remove more obsolete strings.
This settings screen is not shown, and is removed in a subsequent change.

Change-Id: If9a19429160ab8b12d8e57002b80282a7531fd82
2015-04-13 11:35:11 -04:00
Geoff Mendal
442f3e35f2 Revert "Import translations. DO NOT MERGE"
This reverts commit ff09fe57b2.

Change-Id: I38c0bddd69395cdda2e7ea4e3e08eb9395d74db8
2015-04-13 14:50:47 +00:00
Geoff Mendal
ff09fe57b2 Import translations. DO NOT MERGE
Change-Id: I73d89b1cf5e685aeff2137d24ebe00fca5d70595
Auto-generated-cl: translation import
2015-04-13 07:29:28 -07:00
John Spurlock
d5656b6eb1 Merge "Settings: Remove reference to removed string from manifest." 2015-04-13 14:06:17 +00:00
John Spurlock
9cc770eea7 Settings: Remove reference to removed string from manifest.
Bug: 20064962
Change-Id: Ie63d902cc6e327eb3f7df00a0d1c16e23f93634e
2015-04-13 10:02:10 -04:00
Geoff Mendal
b21cd50b03 Revert "Import translations. DO NOT MERGE"
This reverts commit 918bd23627.

Change-Id: Ided42e8810b348228aacf16434bfa00419682fb8
2015-04-13 13:44:56 +00:00
Geoff Mendal
918bd23627 Import translations. DO NOT MERGE
Change-Id: I2447305da552484bc865922e4a5f5993e8733c14
Auto-generated-cl: translation import
2015-04-13 08:10:40 -05:00
Jeff Sharkey
42833b2ff4 Checkpoint of new storage UI.
Top-level storage UI now shows list of all devices, both internal
and adopted/private volumes, and public/shared volumes.

When viewing a private volume, show traditional clustering of data
types, including summary of other users.  For adopted volumes, any
actions are tucked away in a menu, since they're not primary.  Misc
files browsing is now provided by DocumentsUI.

Teach StorageMeasurement about new private volumes, including
handling emulated volumes stacked above them.  When measuring, only
consider apps actually hosted on the current volume UUID.

When viewing a public volume, we default to launching into file
management mode, and offer a simple eject button at the top-level
view.  File management mode is offered by new DocumentsUI browse
intent, and a Settings link there redirects back to us for actual
operations like ejecting/formatting.  When unmounted, we launch
into our action view.

Actions like ejecting/formatting just show simple toasts for now.

Bug: 19993667
Change-Id: Ie990ef3c01fb3717aaf8c79bfc53aac7edefdcf7
2015-04-12 22:02:32 -07:00
Prerepa Viswanadham
09c0c1385a Merge "Merge commit 'a14fc12' into merge_work" 2015-04-12 21:59:38 +00:00
Prerepa Viswanadham
71b4574dbf Merge changes Ia5f7028f,I1d7dc74b
* changes:
  Merge commit '2957939' into merge_work
  Merge commit '0507524' into merge_work
2015-04-12 21:58:55 +00:00
Jim Miller
8e056115ee Clean up FingerprintManager API and make it public.
Change-Id: Ia5f36857da27da5c3a942350b7f772d237a50bc2
2015-04-11 09:19:05 -07:00
Fabrice Di Meglio
de6fe895ab Merge "Add user selectable Default Browser feature" 2015-04-11 02:09:34 +00:00
Fabrice Di Meglio
2eb901a4e8 Add user selectable Default Browser feature
- add Default Apps section in Apps / Advanced
- follow UX spec

This change depends on a Framework change which adds new APIs in PackageMaager
for setting and getting the default Browser App package name.

See bug #20144393

Change-Id: I2ff456eeaced9f740f4dd6fb6bccea6de6ea1308
2015-04-10 19:04:53 -07:00
Alan Viverette
257d13b7cf Wrap tintable icons with correctly tinted drawable XML
Replaces pre-tinted icons with flat black, grayscale versions suitable
for use as alpha masks.

Bug: 20143927
Change-Id: I0bca5dee6fcb273902db174c818cc529a5c13f91
2015-04-10 15:46:18 -07:00
Prerepa Viswanadham
1300c49224 Merge commit 'a14fc12' into merge_work 2015-04-10 15:45:48 -07:00
Prerepa Viswanadham
a5f7028ffd Merge commit '2957939' into merge_work 2015-04-10 15:45:36 -07:00
Prerepa Viswanadham
1d7dc74b45 Merge commit '0507524' into merge_work 2015-04-10 15:43:14 -07:00
Lifu Tang
b1c342929c Merge "Updated the string resource" 2015-04-10 22:27:31 +00:00
John Spurlock
35fba3eeaf Settings: New zen option to allow repeat callers.
Bug: 20064962
Change-Id: Icc65da146503386c057d7f78d6610f83f56d1a92
2015-04-10 08:12:14 -04:00
John Spurlock
d333a7d9f1 Settings: Improve automatic rule summary when enabled.
Bug: 20064962
Change-Id: I139679def84f0ba3ea859399499a5657fd85e763
2015-04-10 00:02:32 -04:00
John Spurlock
45fa140b8c Settings: An update on Downtime.
- Migrate settings to the new zen mode state model.
 - Remove downtime settings.
 - Add automatic rule management page (add/remove)
 - Bind new automatic schedule rules to detail editor.
 - Clean up a few found miscapitalized string captions.
 - Migrate zen switch to report the shared summary string.

Bug: 20064962
Change-Id: Ia561e7f77c90c962729240b4d51ba1915297f64a
2015-04-09 20:56:16 -04:00
Maurice Lam
342d08537f Merge "Add support for material_blue theme" 2015-04-09 20:13:36 +00:00
Lifu Tang
82210af707 Merge "Worked around back button navigation issue" 2015-04-09 17:26:47 +00:00
Lifu Tang
d033285ca7 Worked around back button navigation issue
Calling startWithFragmentAsUser() without specifying FLAG_ACTIVITY_NEW_TASK to
the intent starting the fragment could cause a native stack corruption. See
b/17523189. However, adding that flag and start the preference panel with the
same UserHandler will make it impossible to use back button to return to the
previous screen. See b/20042570.

We work around this issue by adding FLAG_ACTIVITY_NEW_TASK to the intent, while
doing another check here to call startPreferencePanel() instead of
startWithFragmentAsUser() when we're calling it as the same user.

Bug: 20042570
Change-Id: I26b269414f410912b77aaa553a3fccebfa148659
2015-04-09 10:10:12 -07:00
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
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