Commit Graph

43256 Commits

Author SHA1 Message Date
Fan Zhang
e023815df7 Merge "Update pref fragment for "see all" in app & notification" into pi-dev am: 60e108788c
am: ea68f2c467

Change-Id: Ia2d788d3bad5010b22947412a4c60b6009a0a9d0
2018-03-06 21:11:33 +00:00
Doris Ling
b76682afcb Merge "Create a new list when building suggestion data." into pi-dev 2018-03-06 21:09:24 +00:00
Antoan Angelov
a2baf5d4f2 Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev am: 95d0b95948
am: 94de70ebf9

Change-Id: Iaab96026c3f661b0e3180d381b13c5b69984d6fe
2018-03-06 20:59:51 +00:00
Victor Chang
65e4c8d48e Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev am: 6a3bac39bf
am: 1007fe2c0f

Change-Id: I6070876652d255c315a172c97b1e536c133f5b65
2018-03-06 20:51:49 +00:00
TreeHugger Robot
8f464b12b6 Merge "Add auto restriction preference" 2018-03-06 20:48:28 +00:00
Alex Cruz
8704b90878 Merge "DO NOT MERGE: Change encryption preference's summary accordingly"
am: ab5a3898f5  -s ours

Change-Id: Ie07848592baa2ee12806a1aa106e75c9f1cd4a92
2018-03-06 20:44:19 +00:00
Fan Zhang
ea68f2c467 Merge "Update pref fragment for "see all" in app & notification" into pi-dev
am: 60e108788c

Change-Id: I5e8a4c9aa1676343d61cfd65817372d2dca32ee1
2018-03-06 20:27:43 +00:00
Doris Ling
b619e51baf Fix crash in battery info settings page.
- when receive package updates, check if the buttons preference is
available before trying to update the UI.

Change-Id: Ie3482b94c84cd55e9a138af4719a031f5167e089
Fixes: 74130214
Test: make RunSettingsRoboTests
2018-03-06 12:26:54 -08:00
TreeHugger Robot
db5e0ef9bb Merge changes from topics "tip_new_page_3", "tip_new_page_2", "tip_new_page_1"
* changes:
  Hook up the new page to PowerUsageSummary
  Create new PowerUsageAdvanced page
  Change current PowerUsageAdvanced to legacy code
2018-03-06 20:25:34 +00:00
Antoan Angelov
94de70ebf9 Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev
am: 95d0b95948

Change-Id: Ia205bc4fdba0b5f8e5ffcb5c05e0e7543dc6a8ce
2018-03-06 20:11:06 +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
Weilun Du
68a195ae93 Disable bluetooth controller if unsupported
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409

Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
2018-03-06 12:05:32 -08: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
Victor Chang
1007fe2c0f Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev
am: 6a3bac39bf

Change-Id: If54bf59a1969914c9fbbffaf17f4f687e85f2b71
2018-03-06 19:52:52 +00: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
Antoan Angelov
95d0b95948 Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev 2018-03-06 19:37:52 +00:00
TreeHugger Robot
6a3bac39bf Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev 2018-03-06 19:24:48 +00:00
jackqdyulei
f51c220e98 Hook up the new page to PowerUsageSummary
Add a menu to point to the new page

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
2018-03-06 10:59:40 -08:00
Treehugger Robot
ab5a3898f5 Merge "DO NOT MERGE: Change encryption preference's summary accordingly" 2018-03-06 18:55:54 +00:00
Doris Ling
05811609c7 Create a new list when building suggestion data.
- using sublist of the original suggestions list may results in
ConcurrentModificationException if the originaly list is being modified.
Create a new list instead to avoid running into the issue.

Change-Id: Ia83a0432be542eeb428d177f6118d26fc2262e93
Fixes: 74194336
Test: run monkey
2018-03-06 10:55:40 -08:00
jackqdyulei
319d534975 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
2018-03-06 10:45:44 -08:00
jackqdyulei
5dd5a0424f Change current PowerUsageAdvanced to legacy code
In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
2018-03-06 10:42:53 -08:00
Fan Zhang
ba668a86e0 Fix tests am: 59520b028a
am: 2ce9c0f870

Change-Id: Iaf3c6d77ba894f676b3da36d3f1ea8f3873c1fc3
2018-03-06 18:38:41 +00:00
jackqdyulei
ab0b0add0a 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
2018-03-06 10:31:37 -08:00
Fan Zhang
2ce9c0f870 Fix tests
am: 59520b028a

Change-Id: Id73287aaf750237ffa9d43123654c5a0616d4a7b
2018-03-06 18:16:03 +00: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
59520b028a Fix tests
Change-Id: I8b750a87e6852d60ac2f8f61a955b1296cef759b
Fixes: 74234076
Test: robotests
2018-03-06 09:09:31 -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
Mariano Giardina
c94cf51666 Merge "Revert "Disable bluetooth controller if unsupported"" 2018-03-06 12:18:48 +00: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
Mariano Giardina
b8709ca0e2 Revert "Disable bluetooth controller if unsupported"
This reverts commit 726f115660.

Reason for revert: broke git_master
https://android-build.googleplex.com/builds/submitted/4635329/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: Icefa78f0a79f7ff0af373f3f0cd35d200cd4fec8
2018-03-06 11:02:31 +00:00
TreeHugger Robot
6e97fc8d86 Merge "Disable bluetooth controller if unsupported" 2018-03-06 07:28:15 +00:00
Alex Cruz
f2fb449430 DO NOT MERGE: 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.

Test: Go into Settings/Security & Location

Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
2018-03-06 04:21:39 +00:00
Ben Lin
af4f9005c6 Merge "Add ability to open up "Open by default" page directly via intent." 2018-03-06 04:01:39 +00:00
Fan Zhang
1055ab3b74 Merge "Reuse xml parser logic to scrape preference xml files." into pi-dev am: e8acc0c4bd
am: e9610eadfa

Change-Id: If0dc5c9d0457b7d134edcb8dce8bdf43e3cdabae
2018-03-06 02:42:51 +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
Fan Zhang
d0bd7e7d46 Merge "Fix double help icon in wificalling screen" into pi-dev am: b0c7609052
am: 102fa7c853

Change-Id: I6e09438d5b2337a2cac206dd051d3a121591e059
2018-03-06 01:34:26 +00:00
TreeHugger Robot
07c430fbcf Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." 2018-03-06 01:31:36 +00:00
Fan Zhang
e9610eadfa Merge "Reuse xml parser logic to scrape preference xml files." into pi-dev
am: e8acc0c4bd

Change-Id: I4675c7b124c208447ac9bd7f5fee4413413ecd79
2018-03-06 01:20:55 +00:00
Fan Zhang
7fd248052c Correctly propagate bundle extra from intent to fragment am: e8666c6664
am: e9e8858d3b

Change-Id: Id90c72daf4a3b15b43dd87aa87bd54c7e3b829ad
2018-03-06 01:13:54 +00:00
Fan Zhang
102fa7c853 Merge "Fix double help icon in wificalling screen" into pi-dev
am: b0c7609052

Change-Id: Ic0f9ef49fc623ca3498c807a7eb071b78797aa88
2018-03-06 00:57:54 +00:00
Fan Zhang
e9e8858d3b Correctly propagate bundle extra from intent to fragment
am: e8666c6664

Change-Id: I8658f9460d4d06c746dcfd2aa1b037fe7bb545b9
2018-03-06 00:36:33 +00:00
Fan Zhang
e8acc0c4bd Merge "Reuse xml parser logic to scrape preference xml files." into pi-dev 2018-03-06 00:24:40 +00:00
Fan Zhang
b0c7609052 Merge "Fix double help icon in wificalling screen" into pi-dev 2018-03-05 23:43:05 +00:00
Fan Zhang
3b47e5bc9f Reuse xml parser logic to scrape preference xml files.
Bug: 73668763
Test: atest
Test: robotests
Change-Id: Ifc241b5b4ec6d2935c4c532ff902a7ba352a98d6
2018-03-05 14:20:19 -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
Fan Zhang
e8666c6664 Correctly propagate bundle extra from intent to fragment
When someone launches settings intent and include args for fragment, we
should propagate the args to fragment.

Change-Id: I231a675123f056043e96ffad7498da6b9bc16687
Fixes: 74017572
Test: manual
2018-03-05 21:35:31 +00:00
Fan Zhang
a00ed0aad6 Fix double help icon in wificalling screen
Change-Id: I36d4af83e1cb7fd77b360829baab2004422488c6
Fixes: 71538192
Test: robotests
2018-03-05 13:19:46 -08:00