Victor Chang
53bad6b0dd
Merge "Time zone, Region, UTC picker" into pi-dev am: 2e79a7cc42
...
am: b6ebf73183
Change-Id: Ie384b26383df634ef41d334fd81ec794b12f89b4
2018-03-07 01:02:13 +00:00
Bill Yi
0b8c98c03b
Merge "Import translations. DO NOT MERGE" into pi-dev am: bcf3e12556
-s ours
...
am: 3a2ffddc3a
-s ours
Change-Id: Ibcd6d661e35e3442f326307bb1691a9c182beece
2018-03-07 00:40:03 +00: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
Alex Cruz
179cb304fd
Merge "Change encryption preference's summary accordingly" into pi-dev am: 5218829f68
...
am: fc21073438
Change-Id: I30897397f0e50fc2a37cfc286f40ce85bf4746ff
2018-03-06 23:04:19 +00:00
Bill Yi
3a2ffddc3a
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: bcf3e12556
-s ours
Change-Id: I61a0849e3af8523abcefe06b2aac8a77e55e9aac
2018-03-06 23:02:26 +00:00
Alex Cruz
178054edd6
Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5
-s ours am: 8704b90878
-s ours
...
am: a09731f592
-s ours
Change-Id: I463339937008747402cdbada4cb21d9cfbe41bf4
2018-03-06 22:53:01 +00:00
Weilun Du
cd090f72ba
Merge "Disable bluetooth controller if unsupported"
2018-03-06 22:10:06 +00:00
Doris Ling
c843667e9a
Merge "Create a new list when building suggestion data." into pi-dev am: b76682afcb
...
am: 8aaf313532
Change-Id: Iecd6bf597ad5c2f7370a211e925235498fba88d7
2018-03-06 22:04:12 +00: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
Alex Cruz
fc21073438
Merge "Change encryption preference's summary accordingly" into pi-dev
...
am: 5218829f68
Change-Id: I371d320e07ce35543d218ccf0e75e5e2438f1e4c
2018-03-06 21:43:13 +00:00
TreeHugger Robot
5218829f68
Merge "Change encryption preference's summary accordingly" into pi-dev
2018-03-06 21:31:07 +00:00
Alex Cruz
a09731f592
Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5
-s ours
...
am: 8704b90878
-s ours
Change-Id: Ie2e6a2b036e08796f34ed7fdd9e1bce46bf681d6
2018-03-06 21:28:29 +00:00
Doris Ling
8aaf313532
Merge "Create a new list when building suggestion data." into pi-dev
...
am: b76682afcb
Change-Id: I5ecf9a7a5c7e6654129d7d3ae2504a5553c04d0e
2018-03-06 21:22:57 +00:00
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
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
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
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
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