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
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
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
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
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
Mariano Giardina
c94cf51666
Merge "Revert "Disable bluetooth controller if unsupported""
2018-03-06 12:18:48 +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
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
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
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
Victor Chang
e10875210a
Fix SettingsRoboTests build error with OpenJDK 9
...
- CL http://ag/3671365 broke git_pi-release/marlin-userdebug-jdk9
when building "m checkbuild". It shouldn't break the image build
Test: m SettingsRoboTests
ROBOTEST_FILTER=com.android.settings.datetime.timezone
EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true
Change-Id: I161c0350cff55bd13ba4a6c63df4e4e9bc4b1a5f
2018-03-05 20:26:38 +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
Weilun Du
726f115660
Disable bluetooth controller if unsupported
...
Only disable the controllers not the whole fragment because
user might need to have entry for other features.
Change-Id: I9c44cca97189a2115785cf70aee8eb580ac56000
Fixes: 73664409
Signed-off-by: Weilun Du <wdu@google.com >
2018-03-03 14:42:16 -08:00
Victor Chang
229a6a2bc4
Merge "Time Zone data loader"
2018-03-03 15:39:51 +00:00
Bill Yi
52b430ba71
Import translations. DO NOT MERGE am: 509d7bbc5d
-s ours
...
am: 3cf7a46b83
-s ours
Change-Id: I5bd457b3f4acdfbadc5f59372a4e268f2373b617
2018-03-03 12:54:10 +00:00
Bill Yi
3cf7a46b83
Import translations. DO NOT MERGE
...
am: 509d7bbc5d
-s ours
Change-Id: I3e779491dc73f006b0f759d02b0072a06b952ead
2018-03-03 12:50:06 +00:00
Phil Weaver
203b923cb4
Settings reflect new a11y shortcut on lockscreen
...
Matching changes to the framework behavior. The
setting is on by default iff the user has agreed
to use the a11y shortcut.
Bug: 70944865
Test: Adding new test for this fragment that checks
this behavior
Change-Id: I7831f64cf3ec59c2d266340cc570227433a4febb
2018-03-03 03:35:24 +00:00
Xiangyu/Malcolm Chen
68628c2edd
Merge "Disable "Mobile data" in "Data usage" if no SIM."
2018-03-03 02:42:51 +00:00
TreeHugger Robot
94e256743a
Merge "Add column uid to database"
2018-03-03 01:13:50 +00:00
TreeHugger Robot
e4d7c0d2f7
Merge "Fix switch bar in location settings"
2018-03-03 00:37:45 +00:00
Malcolm Chen
0bedf3569e
Disable "Mobile data" in "Data usage" if no SIM.
...
If SIM is taken out, we disable "Mobile data" button in "Data usage"
page.
Bug: 67408951
Test: manual
Change-Id: I9f8937eadd5494f4f7710b9d5431176a13324bdd
2018-03-02 16:00:33 -08:00
jackqdyulei
fec8846036
Add column uid to database
...
In database upgrade, reconstruct the database since
it is still empty.
Bug: 74022362
Test: Build
Change-Id: I8d7f7280a7438f371f7e3a2ed1116ba82517d6a6
2018-03-02 14:25:37 -08:00
TreeHugger Robot
9dfb33ad71
Merge "Import translations. DO NOT MERGE"
2018-03-02 22:17:17 +00:00
Maggie
601054ce6a
Fix switch bar in location settings
...
When user rotates the device in location settings, the swtich bar with
"Use Location" is gone. This change fixes the problem.
Also, remove override getInitialExpandedChildCount() in
LocationSettings. We will use nested PreferenceCategory instead once the
support is ready.
Bug: 73872033
Bug: 70843646
Test: Manual
Change-Id: I343b549398ef2b3d64ca7962b5f2a4ef0441c7f5
2018-03-02 14:16:59 -08:00
TreeHugger Robot
36b5d08f55
Merge "Add OWNERS file in timezone package"
2018-03-02 20:26:36 +00:00