Commit Graph

6810 Commits

Author SHA1 Message Date
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
Geoff Mendal
285aa88465 Import translations. DO NOT MERGE
Change-Id: Ie968e96e3a2420226abd618b77db0f5a03d2ae5e
Auto-generated-cl: translation import
2015-04-08 08:23:55 -05: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
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
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
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
Elliott Hughes
483d7989de am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit 'ff095ab05bc6660abd38d9de047ac467c2d070fc':
  Add Europe/Istanbul timezone
2015-04-02 17:50:21 +00:00
Elliott Hughes
ff095ab05b am 189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
  Add Europe/Istanbul timezone
2015-04-02 17:40:44 +00:00
Samuel Asteberg
7019943855 Add Europe/Istanbul timezone
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
2015-04-02 18:18:24 +02: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
Elliott Hughes
1321412c79 am 14083abb: am 144c48e7: am 49fe5084: Merge "add Recife timezone"
* commit '14083abbe9fa5966f3abb718e19132c18861fb76':
  add Recife timezone
2015-04-02 02:59:40 +00:00
Elliott Hughes
14083abbe9 am 144c48e7: am 49fe5084: Merge "add Recife timezone"
* commit '144c48e72736ce9617dfa15331262c13819a17e6':
  add Recife timezone
2015-04-02 02:33:26 +00:00
Elliott Hughes
144c48e727 am 49fe5084: Merge "add Recife timezone"
* commit '49fe5084f73821906572f60bd542ca5042cb794d':
  add Recife timezone
2015-04-02 01:13:17 +00:00
Elliott Hughes
49fe5084f7 Merge "add Recife timezone" 2015-04-01 23:55:55 +00:00
Geoff Mendal
c6c8b291d1 Import translations. DO NOT MERGE
Change-Id: I461162761644acfebe4b32ef6e00476acb7e2988
Auto-generated-cl: translation import
2015-04-01 05:37:29 -05: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
Geoff Mendal
ec5a3373db Import translations. DO NOT MERGE
Change-Id: I27d243fa4d6ef7c0cb916a242d595cf48bf5e11d
Auto-generated-cl: translation import
2015-03-30 08:16:32 -05:00
Alan Viverette
40b55b1d33 Merge "Fix switch bar theme, clean up text appearances" 2015-03-27 23:16:15 +00:00
Geoff Mendal
1e63f8434c Import translations. DO NOT MERGE
Change-Id: Ic235d2ba6215cbcf6850d8e7fab2a405311b7d32
Auto-generated-cl: translation import
2015-03-27 15:14:21 -07:00