Commit Graph

14235 Commits

Author SHA1 Message Date
Fan Zhang
36680b0934 For vibration settings page, create controllers from xml
This change leverages a new support in settings framework to
automatically share preference controllers between full setting page,
search, and slice provider.

Bug: 73668763
Test: existing robotest and atest
Change-Id: Ie96a28f1b503377b3fdf86e28d297c8560d8bf71
2018-03-07 14:48:26 -08:00
Andreas Terzis
d9eba6b856 Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev 2018-03-07 22:46:13 +00:00
Fan Zhang
6acc0cf3cd Update string: clear data -> clear storage
Change-Id: I710f7b95a53e5437d895ff920f3cce7aa4c5a6cf
Fixes: 34515307
Test: visual
2018-03-07 13:19:52 -08:00
Andreas Terzis
30743c787e Rename "Billing Cycle" to "App usage cycle".
Under Settings > Data Usage, rename "Billing cycle" to
"Data warning & limit".

In the new "Data warning & limit" screen rename "Billing cycle"
to "App usage cycle".

Bug: 74321150
Test: manual
Change-Id: Ied4fd604fe98f5fc613fd4f7fc3a3bea5908bb7c
2018-03-07 12:19:36 -08:00
Fan Zhang
4a9cd8efc5 Merge "Misc fixes to improve search" into pi-dev
am: 6b83c2d332

Change-Id: Ifd491df275c7e74bf52901b2a919e1f6043efe00
2018-03-07 20:07:50 +00:00
Fan Zhang
02caf0f861 Misc fixes to improve search
- Suppress one of results from "On lock screen"
- Remove screen title from sub sections in data usage screen.
- On UserSettins, index using resource instead raw. And build
  non-indexables using getNonIndexable and pref controlleres.

Change-Id: I947a97af60f1a08b237fda2f3c456cf1105b9231
Fixes: 74120518
Fixes: 74119743
Fixes: 74250251
Fixes: 74119687
Test: reindex
2018-03-07 10:00:57 -08:00
Victor Chang
4e77e8bc7a Merge "New time zone picker page" into pi-dev
am: 999e4f4405

Change-Id: I30588e0e89d644c5575be6c2c2512bc5fb7d71a6
2018-03-07 17:27:22 +00:00
Victor Chang
999e4f4405 Merge "New time zone picker page" into pi-dev 2018-03-07 17:09:59 +00:00
Beverly
a6b969b934 Merge "System gets its own dnd toggle" into pi-dev
am: 1e9268b52e

Change-Id: I7d697d483791a30a8c6ad966dad760bcc00e02f3
2018-03-07 16:53:44 +00:00
TreeHugger Robot
1e9268b52e Merge "System gets its own dnd toggle" into pi-dev 2018-03-07 16:39:40 +00:00
Victor Chang
d5adf42c5e New time zone picker page
- Show current selected region and time zone in a 2 rows.
  Defailed info of current selected time zone in footer
- Show option menu to switch to select UTC offset
- This picker will be changed to the default picker in a later CL

Bug: 73952488
Test: m RunSettingsRoboTests
Change-Id: Ia81bb022e1021369612f5bd60c2c1f4d08db2af8
(cherry picked from commit b7d588f341)
2018-03-07 11:52:25 +00:00
jackqdyulei
eb562c9457 Make "Add device" as restricted preference.
Restrict it by DISALLOW_CONFIG_BLUETOOTH

Bug: 73739404
Test: Manual
Change-Id: Ia550930ccf9f372b15826e24d3677124efd36fe9
2018-03-07 04:23:05 +00:00
Yoshinori Hirano
fd8527901e Merge "Add SettingsMultiSelectListPreference style" into pi-dev
am: 106825383a

Change-Id: I6a796081208050d58a42a32ec69a2bd20cee1fcf
2018-03-07 04:19:47 +00:00
Doris Ling
9f6608a729 Merge "Add strings for audio output switcher." into pi-dev
am: 6775ff9542

Change-Id: Id400699f8d74cdda74721fdd193dc809d998bce5
2018-03-07 04:17:56 +00:00
jackqdyulei
da31b26d8b Merge changes from topic "tip_new_page-pi-dev" into pi-dev
am: a276b8d580

Change-Id: Icb1d923c07e48466b7f024e091d01c69a001073e
2018-03-07 04:10:32 +00:00
TreeHugger Robot
106825383a Merge "Add SettingsMultiSelectListPreference style" into pi-dev 2018-03-07 03:47:20 +00:00
TreeHugger Robot
6775ff9542 Merge "Add strings for audio output switcher." into pi-dev 2018-03-07 03:42:13 +00:00
TreeHugger Robot
a276b8d580 Merge changes from topic "tip_new_page-pi-dev" into pi-dev
* changes:
  Hook up the new page to PowerUsageSummary
  Create new PowerUsageAdvanced page
  Change current PowerUsageAdvanced to legacy code
2018-03-07 03:40:50 +00:00
jackqdyulei
3968b061e8 Merge "Add auto restriction preference" into pi-dev
am: f178692bc5

Change-Id: I097a604222b45e5048e0f5e9c831766b2bf0b5e5
2018-03-07 03:29:43 +00:00
TreeHugger Robot
f178692bc5 Merge "Add auto restriction preference" into pi-dev 2018-03-07 02:32:17 +00:00
Yoshinori Hirano
447192f903 Add SettingsMultiSelectListPreference style
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
2018-03-06 17:45:07 -08:00
jackqdyulei
31a5960424 Create new PowerUsageAdvanced page
This page contains the graph at the top and app list at the bottom

In this cl, we reused some part of the code in PowerUsageAdvancedLegacy
to construct the graph, and also used controller to construct the app
list(So glad that we extracted it to controller before..)

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I30afbc0327a5186f8280f5e3678330b363e2dc0d
Merged-In: I30afbc0327a5186f8280f5e3678330b363e2dc0d
2018-03-06 16:10:30 -08:00
Victor Chang
b6ebf73183 Merge "Time zone, Region, UTC picker" into pi-dev
am: 2e79a7cc42

Change-Id: I356812eb0b04145b02cbc785f47fb1edba986916
2018-03-06 23:34:01 +00:00
jackqdyulei
d0086188d2 Change current PowerUsageAdvanced to legacy code
In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
Merged-In: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
2018-03-06 15:27:20 -08:00
Doris Ling
7b59cde2ce Add strings for audio output switcher.
Bug: 74130772
Test: rebuild
Change-Id: I84b702b69cc0cd23caeebb441ad8310b56441b5b
2018-03-06 15:15:01 -08:00
Victor Chang
2e79a7cc42 Merge "Time zone, Region, UTC picker" into pi-dev 2018-03-06 22:01:35 +00:00
TreeHugger Robot
bcf3e12556 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 21:59:34 +00:00
jackqdyulei
155c1785e1 Add auto restriction preference
1. Add method in feature provider to check whether smart battery
is supported
2. Hook up above method to controllers
3. Add auto restriction preference
4. Add tests

Bug: 73002171
Test: RunSettingsRoboTests
Change-Id: Ic314f61ad52e9bedb629b308731cb968bb4b1773
Merged-In: Ic314f61ad52e9bedb629b308731cb968bb4b1773
(cherry picked from commit ab0b0add0a)
2018-03-06 21:32:56 +00:00
TreeHugger Robot
5218829f68 Merge "Change encryption preference's summary accordingly" into pi-dev 2018-03-06 21:31:07 +00:00
TreeHugger Robot
60e108788c Merge "Update pref fragment for "see all" in app & notification" into pi-dev 2018-03-06 20:05:33 +00:00
Bill Yi
b109d2e4e0 Import translations. DO NOT MERGE
Change-Id: Ia6564078c6d51196f13770bbeb896503e7333c19
Auto-generated-cl: translation import
2018-03-06 11:59:37 -08:00
Alex Cruz
d2a8b1ff02 Change encryption preference's summary accordingly
With this change a summary to the encryption preference was added.

415ce9a77d

The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.

This is cherry-picked from
https://android-review.googlesource.com/#/c/platform/packages/apps/Settings/+/517875/

Test: Go into Settings/Security & Location
Fixes: 68691666
Fixes: 68542516
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
2018-03-06 11:40:49 -08:00
Antony Sargent
403c8d5ba8 Remove unused file res/layout/usb_dialog_container.xml
It looks like the class which used this (UsbModeChooserActivity.java)
was removed in 40bd570352.

Bug: 70848054
Test: should be covered by existing tests
Change-Id: I307852484055dc7f04dc81d5f03145dfde765add
2018-03-06 10:11:19 -08:00
Fan Zhang
0ced370427 Update pref fragment for "see all" in app & notification
Instead of launching intent, now to launches all app list as a
subsetting. This is more consistent with the other setting pages and
fixes a task affinity issue.

Change-Id: I0464a2b8f46d46f06bcf297c0f876ae12a7c490b
Fixes: 74205806
Test: robotests
2018-03-06 08:58:10 -08:00
Beverly
c85496297a System gets its own dnd toggle
Test: make ROBOTEST_FILTER=ZenModeSystemPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 73362490
Change-Id: Id5212665da8c820fc070676ff034dbe67510ea5d
2018-03-06 09:15:29 -05:00
Victor Chang
2b6876ccab Time zone, Region, UTC picker
- Extract most common view related codes into BaseTimeZoneAdapter
  and BaseTimeZonePicker. Subclass handles the text formatting and
  order.
- Search view is added compared to previous version of time
  zone picker
- SpannableUtil is added to preserve spannable when formatting
  String resource.
- Fix the bug using GMT+<arabic> as time zone id. b/73132985
- Fix Talkback treating flags on screens as a separate element

Bug: 72146259
Bug: 73132985
Bug: 73952488
Test: mm RunSettingsRoboTests
Change-Id: I42c6ac369199c09d11e7f5cc4707358fa4780fed
(cherry picked from commit fbd30acef0)
2018-03-06 11:13:59 +00:00
Victor Chang
e00aeff9dc Merge "Time zone, Region, UTC picker" 2018-03-06 11:13:41 +00:00
Ben Lin
2d5df469d3 Introduce boolean flags to show/hide Encryption status.
This adds one new flag:
config_show_encryption_and_credentials_encryption_status

Which when set to false, will hide Encryption status from Encryption &
credentials. This is when the storage is not being handed by Android,
and so this preference would not be necessarily correct.

Bug: 74127210
Test: Updated robotests
Change-Id: I13665fa369086ef29a4de5f99a78bfbaf96f2f6b
2018-03-05 18:27:36 -08:00
Victor Chang
fbd30acef0 Time zone, Region, UTC picker
- Extract most common view related codes into BaseTimeZoneAdapter
  and BaseTimeZonePicker. Subclass handles the text formatting and
  order.
- Search view is added compared to previous version of time
  zone picker
- SpannableUtil is added to preserve spannable when formatting
  String resource.
- Fix the bug using GMT+<arabic> as time zone id. b/73132985
- Fix Talkback treating flags on screens as a separate element

Bug: 72146259
Bug: 73132985
Bug: 73952488
Test: mm RunSettingsRoboTests
Change-Id: I42c6ac369199c09d11e7f5cc4707358fa4780fed
2018-03-05 21:53:56 +00:00
arangelov
e35badd9d5 Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.
Bug: 64893948
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogTest -j40 RunSettingsRoboTests
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest -j40 RunSettingsRoboTests
Change-Id: I9308d8d86a3789b8f2c92b9f4f20cf00cce71d14
2018-03-05 20:27:51 +00:00
arangelov
9308154090 Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.
Bug: 64893948
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogTest -j40 RunSettingsRoboTests
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest -j40 RunSettingsRoboTests
Change-Id: I9308d8d86a3789b8f2c92b9f4f20cf00cce71d14
2018-03-05 17:35:48 +00:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
TreeHugger Robot
9dfb33ad71 Merge "Import translations. DO NOT MERGE" 2018-03-02 22:17:17 +00:00
TreeHugger Robot
8a6c737cb7 Merge "Fix non-unique keys for location settings" 2018-03-02 20:19:36 +00:00
Maggie
81fa5ace46 Fix non-unique keys for location settings
Bug: 74104689
Test: Robo
Change-Id: I54ead73b69a6c62897d6b99e14fa5b6627163052
2018-03-02 10:39:08 -08:00
Eric Sandness
1ee0aa96e4 Merge "Fix Ordering Of Work Notifications Settings" 2018-03-02 16:21:50 +00:00
Eric Sandness
cec61d4cd1 Fix Ordering Of Work Notifications Settings
The work notification settings were previously moved to the bottom of
the notification settings screen, but subsequent changes have caused
them to appear near the top again.  Move them back to the bottom.

Fixes: 64436619
Test: Open Settings app manually with and without a work profile
Change-Id: I90a03eb5c018a7684329e395da027a2f736516eb
2018-03-02 13:02:10 +00:00
mcwilliams
9c4d2f033d Settings: app&notification children count increase
Sunshine is injecting App Usage stats into settings within Apps &
Notifications. Increase the children count to accomodate the extra
entity.

Bug: 74066149
Test: make -j56 RunSettingsRoboTests
Change-Id: I54ca06c942fbdf4e7451f6ed22f6f811b8a67747
2018-03-02 11:31:58 +00:00
TreeHugger Robot
ca1aab7eb0 Merge "Update layout for app preference" 2018-03-02 03:07:00 +00:00
Fan Zhang
21185523e6 Update layout for app preference
The summary and appendix string each takes 50% of horizontal space so
they don't push the other too far off.

Change-Id: I89d859f1ec46340695aa0ef75e4c81e6435b151a
Fixes: 74028565
Test: visual
2018-03-01 17:46:55 -08:00