Commit Graph

2890 Commits

Author SHA1 Message Date
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
John Spurlock
86aaf7f091 Settings: Mark string reference as untranslatable.
Bug: 20175103
Change-Id: I8bee006ae20a972b345178332ab240571851b8bf
2015-04-13 13:01:55 -04: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
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
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
Prerepa Viswanadham
1300c49224 Merge commit 'a14fc12' into merge_work 2015-04-10 15:45:48 -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
John Spurlock
6bb9c54a79 Merge "Zen: Move zen mode preference to switch bar." 2015-04-09 16:58:57 +00: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
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
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
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
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
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
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
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
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
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
Jason Monk
bca21083a3 Merge "Show current screen lock as summary" 2015-04-03 14:56:53 +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
Adrian Roos
43a0cbad1b Merge "Add default emergency app setting" 2015-04-02 15:22:59 +00:00
Adrian Roos
9c86a7adae Add default emergency app setting
Bug: 19841649
Change-Id: I1763ee16e1e10c957261fe663f4c87269adcdef7
2015-04-02 17:21:35 +02:00
Etan Cohen
96c47d45e7 Merge changes from topic 'mwd-merge-040115'
* changes:
  Merge commit '279cb4a' into merge
  Merge commit '898e486' into merge
  Merge commit 'fc75374' into merge
  Merge commit '2241607' into merge
  Merge commit 'fe47522' into merge
2015-04-02 03:07:52 +00:00
Vinit Deshpande
05075242db Enable UI for EAP-SIM/AKA/AKA'
We hide identity field for these; since dynamic
identities are now supported.

Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
2015-03-31 12:36:35 -07:00
Etan Cohen
7caa77e40c Merge commit '2241607' into merge 2015-03-31 11:26:54 -07:00
Jason Monk
25512e82a5 Update string description to be more clear.
Bug: 20000920
Change-Id: I393591ecdedb5dc87b4adb9b2e0a684738bcccee
2015-03-31 13:02:18 -04:00
Jason Monk
9a64a4215e Show current screen lock as summary
Bug: 19819290
Change-Id: Iefdacd6b86f96e6f3577351e7f92b86217b1b7ad
2015-03-30 11:00:36 -04:00
Jason Monk
2f41aa7955 Add permissions screen to advanced apps
Add a screen that shows a list of permissions and how many apps
have been granted them, link to PackageInstaller for control of
the permissions.

Depends on I68cdbe53177f742daf396f4eb53761fd5cda2636
Change-Id: I183848ea89ea41a17eaf663441dc4ef963be99bf
2015-03-30 10:39:29 -04:00
Alan Viverette
fd05a78a03 Fix switch bar theme, clean up text appearances
Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
2015-03-27 10:23:45 -07:00