Commit Graph

19684 Commits

Author SHA1 Message Date
Jason Monk
c1235be6f0 Merge "Allow help to be defined to intent uri" 2015-04-14 19:54:19 +00:00
Jason Monk
23acc2bb8a Allow help to be defined to intent uri
Allow help uris to be either an intent uri or as uri (as they were
before). Also add a default help uri, and specific helps for several
screens.

Bug: 15475009
Change-Id: Iff982892973f01d32ff61ea88d4844e9a7153500
2015-04-14 15:43:20 -04:00
Jorim Jaggi
bc90ee8736 Merge "Fix crash in settings" 2015-04-14 18:36:11 +00:00
Andres Morales
02d548790b Fix crash in settings
Bug: 20207600
Change-Id: I6fe3530c57d0c028ae3b0a0d526b348126c75932
2015-04-14 11:33:45 -07:00
Stuart Scott
2533651570 Merge "Avoid mulitple calls to getActivity." 2015-04-14 18:28:09 +00:00
Jorim Jaggi
aa2a53b3b7 Merge "Fix crash in settings when no fingerprint is available" 2015-04-14 18:15:35 +00:00
Jorim Jaggi
3b62e84289 Fix crash in settings when no fingerprint is available
Bug: 20207600
Change-Id: If2a6251b085f22fffabc43aee197550328e6bfef
2015-04-14 11:14:19 -07:00
Andres Morales
347c13bcb8 Merge "[LockSettings] pipe old password through when setting new one" 2015-04-14 16:12:50 +00:00
Jason Monk
cd0978bcc2 Merge "Move default app preferences to one screen" 2015-04-14 15:04:16 +00:00
Jason Monk
4fa99fe6b7 Merge "Remove all apps page" 2015-04-14 15:03:59 +00:00
Jason Monk
73a2496d31 Move default app preferences to one screen
- Move emergency and SMS app preferences to default apps
 - Fix search on default apps
 - Make all default app prefs use AppListPreference
 - Some approximate UI work on AppListPreference

Bug: 20210110
Change-Id: Id04086163c7e87c92a03af421a27018fb380b45d
2015-04-14 10:24:46 -04:00
Jason Monk
6ef2723004 Remove all apps page
Instead move the functionality back into overflow menu as show/hide
system apps. Also move the reset app preferences from advanced to
the overflow menu.

Bug: 20210160
Change-Id: Ied573e1f7dfc438b06642ee2af8f11868130ba3b
2015-04-14 10:24:33 -04:00
Geoff Mendal
407e483fb6 Import translations. DO NOT MERGE
Change-Id: I3f7eb6b8c57c19c18c7855dc6196d2a37fde2ea1
Auto-generated-cl: translation import
2015-04-14 06:37:09 -07:00
John Spurlock
687e863dee Merge "Settings: Add an xliff example to a string param." 2015-04-14 13:01:10 +00:00
John Spurlock
8fe2e99c31 Settings: Add an xliff example to a string param.
Bug: 20175132
Change-Id: I739274e2293b2b865d4f8d601f9c804b2bea79cd
2015-04-14 08:58:33 -04:00
Jeff Sharkey
b636a428c7 Merge "Checkpoint of new storage wizards." 2015-04-14 05:07:02 +00:00
Jeff Sharkey
94635995e4 Checkpoint of new storage wizards.
Use frameworks/opt/setupwizard/library/ for consistent behavior and
styling on phones and tablets.  Implement every step of wizard flow
and connect them together, even though some steps are currently
non-functional.  All strings to match UX spec, with some adjustment.

Wizards inherit from helper base class.

New interstitials before unmounting or formatting private storage
to confirm user knows consequences.

Bug: 19993667
Change-Id: I2c774e1718d513805ee8aecfc96d066d4730450c
2015-04-13 21:45:39 -07:00
Andres Morales
a0e1236fa9 [LockSettings] pipe old password through when setting new one
Change-Id: Ia98b93d1cdb8c2d0bff42de7ecb59f5b80fb780e
2015-04-13 18:38:46 -07:00
John Spurlock
f24037da65 Merge "Settings: Register zen priority settings entry point." 2015-04-14 01:01:44 +00:00
John Spurlock
c1df2aa963 Settings: Register zen priority settings entry point.
Bug: 20064962
Change-Id: I96e094f7d6859b2033c87013bedc270d0290937c
2015-04-13 20:57:06 -04:00
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