OSDN Git Service
Ivan Chiang [Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev
am:
720a224e00
Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064
TreeHugger Robot [Fri, 27 Apr 2018 01:59:16 +0000 (01:59 +0000)]
Merge changes I3dd31855,Id5a75217 into pi-dev
* changes:
Show docks on previously connected devices page
Show Dock devices in Connected devices page
Phil Weaver [Fri, 27 Apr 2018 00:27:12 +0000 (17:27 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
am:
577f2af92b
Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377
Phil Weaver [Thu, 26 Apr 2018 23:50:54 +0000 (23:50 +0000)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am:
62cd5f7f0f
Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83
Maurice Lam [Thu, 26 Apr 2018 23:19:31 +0000 (16:19 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am:
fd45210510
Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c
Fan Zhang [Thu, 26 Apr 2018 23:12:14 +0000 (23:12 +0000)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:58:37 +0000 (22:58 +0000)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:27:26 +0000 (15:27 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev
am:
3f34ce9a5b
Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612
Lei Yu [Thu, 26 Apr 2018 22:26:50 +0000 (15:26 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
am:
d2e9b56996
Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf
Jason Monk [Thu, 26 Apr 2018 22:26:14 +0000 (15:26 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev
am:
f778a91a88
Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1
Jeff Sharkey [Thu, 26 Apr 2018 22:25:05 +0000 (15:25 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am:
2e3aacaa7a
Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826
Lei Yu [Thu, 26 Apr 2018 22:08:55 +0000 (22:08 +0000)]
Merge "Don't show high usage tip when device is charing" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:07:53 +0000 (22:07 +0000)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
Jason Monk [Thu, 26 Apr 2018 22:05:19 +0000 (22:05 +0000)]
Merge "Add auto-granting of slice permissions" into pi-dev
sunnyshao [Tue, 24 Apr 2018 07:57:25 +0000 (15:57 +0800)]
Modified the AirplaneModePreferenceController for slice
- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature
Fixes:
78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
TreeHugger Robot [Thu, 26 Apr 2018 21:28:16 +0000 (21:28 +0000)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
Salvador Martinez [Thu, 26 Apr 2018 21:15:25 +0000 (14:15 -0700)]
Merge "Only start tether when not already enabled" into pi-dev
am:
f62f91b0b6
Change-Id: If28a47b85fab06484298196305e862759998a72f
Jason Monk [Thu, 26 Apr 2018 21:08:36 +0000 (14:08 -0700)]
Merge "Push full slice index to device index" into pi-dev
am:
3d29ca2893
Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
TreeHugger Robot [Thu, 26 Apr 2018 20:57:57 +0000 (20:57 +0000)]
Merge "Only start tether when not already enabled" into pi-dev
Jason Monk [Thu, 26 Apr 2018 20:48:41 +0000 (20:48 +0000)]
Merge "Push full slice index to device index" into pi-dev
Matthew Fritze [Thu, 26 Apr 2018 20:27:18 +0000 (13:27 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev
am:
a7fd137e2d
Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b
Matthew Fritze [Thu, 26 Apr 2018 20:14:53 +0000 (20:14 +0000)]
Merge "Index database before getting Uri Descendants" into pi-dev
Oscar Shu [Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am:
0b302499cd
Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b
Oscar Shu [Thu, 26 Apr 2018 18:16:49 +0000 (18:16 +0000)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
Jan Nordqvist [Thu, 26 Apr 2018 17:48:03 +0000 (10:48 -0700)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
am:
5f6937dd88
Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
TreeHugger Robot [Thu, 26 Apr 2018 17:33:53 +0000 (17:33 +0000)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
Salvador Martinez [Tue, 24 Apr 2018 23:03:34 +0000 (16:03 -0700)]
Only start tether when not already enabled
The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.
Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes:
78028548
Fixes:
78441216
Fixes:
74368363
Sean Callanan [Thu, 26 Apr 2018 17:04:44 +0000 (10:04 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev
am:
9b08ed63e9
Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd
Sean Callanan [Thu, 26 Apr 2018 16:39:51 +0000 (16:39 +0000)]
Merge "Settings: update color mode preview to final content" into pi-dev
Jason Monk [Fri, 20 Apr 2018 18:08:57 +0000 (14:08 -0400)]
Push full slice index to device index
Test: make RunSettingsRoboTests
Bug:
74555610
Change-Id: I3f0aa1218e1d7e736dc918d83e76423fa81ac6ab
Jason Monk [Thu, 26 Apr 2018 12:50:45 +0000 (05:50 -0700)]
Merge "Fix settings slice caching" into pi-dev
am:
ab3aa6989a
Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3
Jason Monk [Thu, 26 Apr 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Fix settings slice caching" into pi-dev
Ivan Chiang [Wed, 18 Apr 2018 11:06:36 +0000 (19:06 +0800)]
Show docks on previously connected devices page
Implement previously connected Dock Devices part into
SavedDeviceGroupController.
Bug:
78095209
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I3dd318556167c98bc90c0c1c7281804177b9ff74
Ivan Chiang [Thu, 12 Apr 2018 10:21:51 +0000 (18:21 +0800)]
Show Dock devices in Connected devices page
Implement Connected Dock Devices part into
ConnectedDeviceGroupController.
Bug:
77945034
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Id5a75217f64d84038222604fca40613361e6f45d
Fan Zhang [Thu, 26 Apr 2018 04:31:02 +0000 (21:31 -0700)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
am:
a6b773a3e1
Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
TreeHugger Robot [Thu, 26 Apr 2018 04:27:30 +0000 (04:27 +0000)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
Maurice Lam [Thu, 26 Apr 2018 00:53:13 +0000 (17:53 -0700)]
Hide cancel button in Confirm Lock Pattern
Test: Manual
Bug:
77790615
Bug:
77565685
Change-Id: Ic3a12d169be037376f040dd1129678e814760091
Sean Callanan [Thu, 26 Apr 2018 02:38:21 +0000 (19:38 -0700)]
Settings: update color mode preview to final content
Content provided based on image selection and optimization
by the graphics team.
Bug:
69264342
Test: hand testing on B1
Change-Id: I12d1fefab2d7a01a44fccb4960d61ee2c6a25017
Antony Sargent [Thu, 26 Apr 2018 00:52:26 +0000 (17:52 -0700)]
Merge "Layout changes for new animation assets" into pi-dev
am:
10e91c7e1b
Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
TreeHugger Robot [Thu, 26 Apr 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Layout changes for new animation assets" into pi-dev
xshu [Fri, 20 Apr 2018 00:36:46 +0000 (17:36 -0700)]
Hide apps with NETWORK_SETTINGS from special wifi settings
A recent change is made in the wifi framework to allow apps with
NETWORK_SETTINGS permission to bypass checks for the CHANGE_WIFI_STATE
permission. Remove apps with NETWORK_SETTINGS permission from
the list because turning off CHANGE_WIFI_STATE for those apps will not
do anything.
Bug:
78228349
Test: compile, robo test
Manual test:
flash
go to Settings -> Apps & notifications -> Advanced -> Special app access
-> Wi-Fi control
Verify that the "Settings" app is no longer in the list
Top right corner -> show system
Verify that "System UI" is no longer in the list
Change-Id: Ia430a6fb4d5dee534a03609ad1877976204935b2
Matthew Fritze [Tue, 24 Apr 2018 22:30:20 +0000 (15:30 -0700)]
Index database before getting Uri Descendants
onGetSliceDescendants would return empty results if
the call was made before the database was indexed.
This CL checks the index before building the list.
Change-Id: I2e0f88893138a048dbd529d465d68fa4b1a3dc12
Fixes:
78196823
Test: robotests
Antony Sargent [Mon, 23 Apr 2018 22:34:32 +0000 (15:34 -0700)]
Layout changes for new animation assets
The animation videos are changing to have a white background, so we want to
match that in the background color to avoid horizontal bands of the current
grey background color on the edges of the new videos. We're also adding a
divider between the video and the content beneath it.
This CL also includes the new illustration video for the launcher gesture.
Fixes:
77861241
Fixes:
77474484
Test: manual (visit all entries in Settings->System->Gestures, as well as
Settings->Display->Adaptive brightness)
Change-Id: I976782645c9431d40e005960b80353a7da2b89b8
Fan Zhang [Wed, 25 Apr 2018 19:40:14 +0000 (12:40 -0700)]
Use colorPrimary for search bar and suggestion background
Bug:
78519022
Test: visual
Change-Id: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Merged-In: I36b00c689eba1d731e37f8ffb38ab8ee59dba59a
Fan Zhang [Wed, 25 Apr 2018 21:36:26 +0000 (14:36 -0700)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
am:
5605795526
Change-Id: I82717663e3fb2cd95dd9e4a51839b3d0027440d4
Fan Zhang [Wed, 25 Apr 2018 21:28:15 +0000 (21:28 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev
Ivan Chiang [Wed, 25 Apr 2018 19:36:25 +0000 (12:36 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
am:
820a26c6bd
Change-Id: Ie77ac8eb096ebfa37445233481ad31d9511c1b7e
Jan Nordqvist [Wed, 18 Apr 2018 22:20:03 +0000 (15:20 -0700)]
Hiding data remaining text when available space is too small.
Bug:
77799887
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53390a36e74f9832bdc7757cd67d51064e8a77f3
Merged-In: I53390a36e74f9832bdc7757cd67d51064e8a77f3
TreeHugger Robot [Wed, 25 Apr 2018 19:21:56 +0000 (19:21 +0000)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
hjchangliao [Wed, 25 Apr 2018 17:16:41 +0000 (10:16 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am:
dc09b3ff49
Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7
Doris Ling [Wed, 25 Apr 2018 17:16:05 +0000 (10:16 -0700)]
Merge "Fixes crash in security settings." into pi-dev
am:
abe44c2674
Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b
TreeHugger Robot [Wed, 25 Apr 2018 17:13:48 +0000 (17:13 +0000)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
hjchangliao [Wed, 25 Apr 2018 03:38:05 +0000 (11:38 +0800)]
Make Nfc/Beam searchable based on feature availability
Update logic of updateNonIndexableKeys,
in BaseNfcPreferenceController to fix issue.
Add robotest to avoid same problem.
Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c
Fixes:
78540155
Test: make RunSettingsRoboTests
Doris Ling [Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)]
Merge "Fixes crash in security settings." into pi-dev
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl
Also convert the controller to TogglePrefCtrl, and register it in xml.
Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Merged-In: Ifbc95364b47690117b2875cba1cdc4761ad205be
Fixes:
71972185
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 25 Apr 2018 15:14:28 +0000 (08:14 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
am:
69d12406f0
Change-Id: I9e209e042b129f9c1e92878c11ec6affa4e40ccb
TreeHugger Robot [Wed, 25 Apr 2018 15:07:32 +0000 (15:07 +0000)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
caxtonchan [Wed, 25 Apr 2018 03:54:43 +0000 (20:54 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
am:
3f5444b9e4
Change-Id: Ie376aafe5ebfff928e5011ac772f5faaeb494c0d
TreeHugger Robot [Wed, 25 Apr 2018 03:42:17 +0000 (03:42 +0000)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
Salvador Martinez [Wed, 25 Apr 2018 02:08:51 +0000 (19:08 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev
am:
6fcce25b72
Change-Id: Ia85fbd3b5068f739254fae45403fdf2f4b45f595
TreeHugger Robot [Wed, 25 Apr 2018 02:00:48 +0000 (02:00 +0000)]
Merge "Check if boxes still available when restoring state" into pi-dev
caxtonchan [Mon, 23 Apr 2018 07:04:21 +0000 (15:04 +0800)]
Hide the audio switcher if it is not relevant
Bug:
78317337
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Change-Id: I9824941cf410b26ad166aa163d7cccd3bfc31a06
Doris Ling [Tue, 24 Apr 2018 20:19:27 +0000 (13:19 -0700)]
Fixes crash in security settings.
- save the loaded icon drawable to a local var, instead of setting it to
the tile.icon and later reset it, so that we will not run into the issue
that the icon will become null when this is called multiple times.
Change-Id: I0fc73961986cddd97ad1e74b0609ac47d011cc87
Fixes:
78445923
Test: make RunSettingsRoboTests
Doris Ling [Tue, 24 Apr 2018 22:44:52 +0000 (15:44 -0700)]
Fix Data warning title not translated.
am:
1cf0dfd3b2
Change-Id: I8bb8187c3a70afbaa32674e56c4ede29b503b1e8
Phil Weaver [Tue, 24 Apr 2018 21:44:08 +0000 (14:44 -0700)]
Improve battery saver setting a11y semantics
Adding the ability to override a couple a11y traits
of the Settings version of SeekBarPreference.
Setting semantics for the battery level to report
itself as a percentage. Also tweaking the content
description to use a different title. The title isn't
exactly what I'd like, but it is better than just
saying "At 15% - 15%".
Bug:
74357845
Fixes:
78479637
Test: Used a custom accessibility service to inspect
the information coming from the battery saver seek bar.
Change-Id: I9db55cf0bb3cfee86a46d22c1208262407332d5f
Jason Monk [Tue, 24 Apr 2018 21:08:26 +0000 (17:08 -0400)]
Fix settings slice caching
Previously if there were multiple clients it would trigger an infinite
loop as the cache gits dropped after the first bind, and the second
client would trigger another load. Instead now cache as long as slices
are pinned since thats the intended behavior of caching.
Test: make RunSettingsRoboTests
Change-Id: I7d29fab87573120b34cd55e1696c4c5b70fc891c
Fixes:
78471335
Doris Ling [Tue, 24 Apr 2018 20:42:19 +0000 (13:42 -0700)]
Fix Data warning title not translated.
- change to use the title resource id instead of getting the title from
the preference, so that it can react to language change properly.
Change-Id: I7f4b3c49ef1622b3d90bf035597742cac6f7af3c
Fixes:
78318536
Test: run i18nscreenshots
Fan Zhang [Tue, 24 Apr 2018 18:31:58 +0000 (11:31 -0700)]
Update brightness percentage display logic to match sysui.
The brightness raw value is in linear pace, we need to convert
it to gamma space to make it match the way sysui represents the
brightness level.
Bug:
73810208
Change-Id: Ic4551bbeff4a6af30f7af2871a79a7d797279edb
Fixes:
78173473
Test: robotests
HJ ChangLiao [Tue, 24 Apr 2018 17:23:56 +0000 (10:23 -0700)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev
am:
465f6da15b
Change-Id: Ie34ee8d62197bf7e4cfb2e25d5ff71445f2aa9a4
TreeHugger Robot [Tue, 24 Apr 2018 17:19:52 +0000 (17:19 +0000)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 13:23:16 +0000 (06:23 -0700)]
Merge "Switch to new checkPasswordHistory method" into pi-dev
am:
4a1b84e613
Change-Id: Ife2084277acf19f93352e23eae82eb38519a8be1
TreeHugger Robot [Tue, 24 Apr 2018 13:06:57 +0000 (13:06 +0000)]
Merge "Switch to new checkPasswordHistory method" into pi-dev
HJ ChangLiao [Wed, 18 Apr 2018 09:28:21 +0000 (17:28 +0800)]
Add intent receiver in BatterySaverCondition
Receive ACTION_POWER_SAVE_MODE_CHANGING
to listen state and update immediately.
Change-Id: Iff2ebb262d95f43d0c970b32f326e3a3e6981a2a
Fixes:
78104542
Test: make RunSettingsRoboTests
Doris Ling [Tue, 24 Apr 2018 01:49:08 +0000 (18:49 -0700)]
Fix footer text not translated in Magnification settings.
am:
b0877b390d
Change-Id: I3ad2795e60b3f2147f9611b54b014aa491077ce7
Doris Ling [Fri, 20 Apr 2018 23:42:10 +0000 (16:42 -0700)]
Fix footer text not translated in Magnification settings.
- pass in the summary res id instead of the actual text when building
the launch bundle for the magnification settings.
- remove the title argument as we are passing the title res already,
which takes precedence.
Change-Id: I4ba624e1d9722aa980ea94c306df9a015a159555
Fixes:
78126057
Test: run i18nscreenshots
Salvador Martinez [Mon, 23 Apr 2018 23:52:25 +0000 (16:52 -0700)]
Check if boxes still available when restoring state
Apparently when the device is idle long enough the system will clean
up the dialog view for the hotspot band preference. This will cause
restore state to fail once it decides to pause the activity. To avoid
this we should make sure the boxes are not null.
Test: robotest
Bug:
78445411
Change-Id: I2a82b01f894f62be6c5209c78faddc4089aa6301
Jason Monk [Mon, 23 Apr 2018 22:42:21 +0000 (18:42 -0400)]
Add auto-granting of slice permissions
Allow things that can read the index to access slices too.
Test: existing tests unaffected
Bug:
77313888
Change-Id: I54c4b89eefb4354aa6b7dcafb7ac09dc96cbdbeb
Salvador Martinez [Mon, 23 Apr 2018 21:55:19 +0000 (14:55 -0700)]
Merge "Disable hidden network spinner on existing networks" into pi-dev
am:
ac951a69aa
Change-Id: I2fcd1b9dbd807dee783ea0027ab7c9b8e2ff369e
TreeHugger Robot [Mon, 23 Apr 2018 21:38:55 +0000 (21:38 +0000)]
Merge "Disable hidden network spinner on existing networks" into pi-dev
Lei Yu [Mon, 23 Apr 2018 21:28:14 +0000 (14:28 -0700)]
Update insert method for battery database
am:
4bfbaa6047
Change-Id: I69bed4d6ae38dc101878e342e14aa33199f2e810
Lei Yu [Mon, 23 Apr 2018 21:27:59 +0000 (14:27 -0700)]
Add primary key for anomaly database.
am:
0fcddc77c7
Change-Id: I92c7aae2bf77c31863fa1f8191bec104f73097b4
Lei Yu [Fri, 20 Apr 2018 17:51:33 +0000 (10:51 -0700)]
Update insert method for battery database
1. Add conflict code to ignore the confliction and return -1 when
insert fails.
2. Add boolean return value to show whether insert sucessfully
3. Add unit test. We don't write robo test because robolectirc use
"update" to shadow "insert" operation, which returns the wrong data.
Bug:
77968649
Test: SettingsUnitTest
Change-Id: Ibd3b53cdb1796d74ea4a2ca1f067e2b302b939e9
Lei Yu [Fri, 20 Apr 2018 00:37:18 +0000 (17:37 -0700)]
Add primary key for anomaly database.
In this case it won't insert the duplicate data. We don't do migration since
anomaly database only contains transient data.
Bug:
77968649
Test: test still pass
Change-Id: I638564d89ead008ec184b9a4db137436d47df5bc
Salvador Martinez [Mon, 23 Apr 2018 17:50:22 +0000 (10:50 -0700)]
Disable hidden network spinner on existing networks
We only want this to be modifiable if you are adding a network
manually, so this CL disables it for existing networks. You
can still see what the spinner is set to though.
Test: robotests
Bug:
78436456
Change-Id: If660e432eca2dabf5bd16881368657ee89fe5a57
Lei Yu [Fri, 20 Apr 2018 20:08:50 +0000 (13:08 -0700)]
Don't show high usage tip when device is charing
The summary is "Battery may run out soon", it doesn't make sense
when device is charging.
Change-Id: I27394c8a75dac4dcad171e5e215102d39cb33546
Fixes:
78261389
Test: RunSettingsRoboTests
Lei Yu [Mon, 23 Apr 2018 17:09:08 +0000 (10:09 -0700)]
Merge "Fix bugs in auto restriction." into pi-dev
am:
f6e2c19fcc
Change-Id: I2fd187d163c789ade85c40e00d44f58fea18d0be
Lei Yu [Mon, 23 Apr 2018 17:08:33 +0000 (10:08 -0700)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev
am:
10280a53b0
Change-Id: I8d90eec324ddfcb0123247e2e0e37aa6f6f94ab8
Lei Yu [Mon, 23 Apr 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Fix bugs in auto restriction." into pi-dev
Lei Yu [Mon, 23 Apr 2018 16:59:47 +0000 (16:59 +0000)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev
Pavel Grafov [Mon, 23 Apr 2018 16:48:26 +0000 (09:48 -0700)]
Merge "Pick default notification setting for work profile" into pi-dev
am:
bb839f81e3
Change-Id: I8ccd32b12b9da892b5f38d4a95e3217bc8183dcc
TreeHugger Robot [Mon, 23 Apr 2018 16:38:43 +0000 (16:38 +0000)]
Merge "Pick default notification setting for work profile" into pi-dev
Bill Yi [Sat, 21 Apr 2018 05:13:51 +0000 (22:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
77e716e463 -s ours
Change-Id: I9696a4c10e97d66c36a4eaca2c1947cb528ecb01
TreeHugger Robot [Sat, 21 Apr 2018 05:09:44 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Fan Zhang [Sat, 21 Apr 2018 02:24:45 +0000 (19:24 -0700)]
Merge "Catch exception when failing to create slice" into pi-dev
am:
524babb389
Change-Id: Iecb03d8889bb0a1b6f6f43f3b28070bfcc429dff
TreeHugger Robot [Sat, 21 Apr 2018 02:03:49 +0000 (02:03 +0000)]
Merge "Catch exception when failing to create slice" into pi-dev
Matthew Fritze [Sat, 21 Apr 2018 00:44:13 +0000 (17:44 -0700)]
Merge "Add keywords to Slices" into pi-dev
am:
2f911e2e9e
Change-Id: I55871dd10278feab58ec1ff6faf3f3bd672d9e68
Salvador Martinez [Sat, 21 Apr 2018 00:16:46 +0000 (17:16 -0700)]
Merge "Update settings main page battery string" into pi-dev
am:
681353f725
Change-Id: I5a56820ac50ebc322f1352767cfc6fdfe773b292
Fan Zhang [Fri, 20 Apr 2018 19:53:25 +0000 (12:53 -0700)]
Catch exception when failing to create slice
- Created a non-generic exception type when failing SliceData.build()
- Catch exception and log error instead of crash.
- Added a presubmit test
Fixes:
78347031
Test: robotests, atest
Change-Id: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
Merged-In: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
Lei Yu [Fri, 20 Apr 2018 23:26:21 +0000 (16:26 -0700)]
Fix the bug using wrong TimeUnit
It should use DAYS, not HOURS.
Change-Id: I26784822c86e58cad93d35b6772ea54af7efb8f5
Fixes:
78362305
Test: RunSettingsRoboTests
OSDN Git Service
