OSDN Git Service
TreeHugger Robot [Thu, 13 Dec 2018 07:44:19 +0000 (07:44 +0000)]
Merge "Use binary resource support in robolectric"
TreeHugger Robot [Thu, 13 Dec 2018 06:20:19 +0000 (06:20 +0000)]
Merge "Fix ANR in SliceRelayReceiver"
Fan Zhang [Thu, 13 Dec 2018 04:03:28 +0000 (04:03 +0000)]
Merge changes I6e73bcf9,I257ba108
* changes:
Add a timeout waiting for contextual card loader.
Set setting back to default when turning off dev option
TreeHugger Robot [Thu, 13 Dec 2018 03:55:34 +0000 (03:55 +0000)]
Merge "Add vertical and horizontal dividers for large cards of homepage"
James Lemieux [Fri, 7 Dec 2018 20:56:49 +0000 (12:56 -0800)]
Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.
Bug:
74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
Jason Chiu [Wed, 12 Dec 2018 04:08:26 +0000 (12:08 +0800)]
Add vertical and horizontal dividers for large cards of homepage
- Add a new field in ContextualCard to store whether this card is a large one
- Set dividers for large cards in renderer
Fixes:
119528161
Fixes:
119641839
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I5cb95214789f44ccfd8d9ce2177ca2b84835b7a4
Colin Cross [Thu, 13 Dec 2018 03:16:05 +0000 (03:16 +0000)]
Merge "Revert "Change LayoutPreference resource path in robo test""
Colin Cross [Thu, 13 Dec 2018 03:15:08 +0000 (03:15 +0000)]
Revert "Change LayoutPreference resource path in robo test"
This reverts commit
ff8fca7d9eac8edea506d5b7c69f101b329176a3.
Reason for revert: broke build when combined with ag/
5781147
Bug:
120706174
Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407
Raff Tsai [Tue, 11 Dec 2018 09:51:41 +0000 (17:51 +0800)]
Fix ANR in SliceRelayReceiver
The same broadcast are handled in SliceRelayReceiver and WifiScanWorker.
We will only use WifiScanWorker to handle wifi broadcast.
Change-Id: I32c2fcc699ae240f12bd1049ba33e1792ae123b0
Fixes:
120284615
Test: manual
TreeHugger Robot [Thu, 13 Dec 2018 02:11:59 +0000 (02:11 +0000)]
Merge "Change LayoutPreference resource path in robo test"
TreeHugger Robot [Thu, 13 Dec 2018 02:11:52 +0000 (02:11 +0000)]
Merge "Do not return null in getSlice()"
Pasty Chang [Thu, 13 Dec 2018 01:48:58 +0000 (01:48 +0000)]
Merge "Change to use setupcompat and setupdesign for suw pages"
Johnson Lu [Thu, 13 Dec 2018 00:54:46 +0000 (00:54 +0000)]
Merge "Implement receiver flow of WiFi sharing feature"
Fan Zhang [Wed, 12 Dec 2018 23:07:59 +0000 (15:07 -0800)]
Add a timeout waiting for contextual card loader.
- Intially setting it to 1 second.
- Also changed card appear animation from drop in to fade in. It looks
less janky if we don't animate any size change.
- And some random code cleanup
Change-Id: I6e73bcf98fd9aa1d76ae002b94ab5b068dfecf1e
Fixes:
120916829
Test: robotests
Fan Zhang [Wed, 12 Dec 2018 21:40:22 +0000 (13:40 -0800)]
Set setting back to default when turning off dev option
When turning off developer options, mobile data always on setting should
be set back to default, which is ON not OFF.
Change-Id: I257ba108976b05162fa3cea6e48f3490e9c64f80
Fixes:
119719605
Test: robotests
TreeHugger Robot [Wed, 12 Dec 2018 23:49:30 +0000 (23:49 +0000)]
Merge "Add temporary link to PermissionController for new default apps UI."
TreeHugger Robot [Wed, 12 Dec 2018 20:07:39 +0000 (20:07 +0000)]
Merge "Update settings together with framework changes"
Hai Zhang [Tue, 11 Dec 2018 01:23:34 +0000 (17:23 -0800)]
Add temporary link to PermissionController for new default apps UI.
This change adds a temporary link in the default apps settings to
allow launching the new default apps UI in PermissionController during
the process we migrate default apps to use roles.
Bug:
110557011
Test: manually tested the UI
Change-Id: I0ac340acd5a077c74b48b28c97f517adb2084a36
TreeHugger Robot [Wed, 12 Dec 2018 18:35:29 +0000 (18:35 +0000)]
Merge "Update background color of Contextual Home Page"
Raff Tsai [Thu, 6 Dec 2018 07:53:35 +0000 (15:53 +0800)]
Do not return null in getSlice()
- It will result in a empty SliceView. Because we can use
slice.hasHint(HINT_ERROR) to check if we should show the slice,
always return a valid slice object.
- Set tintcolor -1 therefore battery icon will not have tint
Bug:
120221527
Test: manual
Change-Id: Idfc97f90c75515b079e1faed802c9b9047bfdeb4
TreeHugger Robot [Wed, 12 Dec 2018 10:05:45 +0000 (10:05 +0000)]
Merge "Implement Wi-Fi DPP UI."
Yanting Yang [Wed, 12 Dec 2018 09:05:36 +0000 (17:05 +0800)]
Update background color of Contextual Home Page
Change-Id: Ifdd708c0ffaaa7bd50e945c33769cb093a40295f
Fixes:
120684259
Test: visual, robotest
Kevin Chyn [Fri, 7 Dec 2018 21:24:50 +0000 (13:24 -0800)]
Update settings together with framework changes
Bug:
120578823
Test: builds, behaves as expected
Change-Id: Id7fd84069c725cde3ed2c38060ab6a636066fcfa
Pasty Chang [Tue, 11 Dec 2018 02:22:55 +0000 (02:22 +0000)]
Change to use setupcompat and setupdesign for suw pages
1. remove the dependence of setupwizardlib.
2. add to use setupcompat and setupdesign.
3. modify new footer button in following up cl.
Bug:
120805516
Bug:
120872944
Test: RunSettingsRoboTests
Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6
Arc Wang [Fri, 7 Dec 2018 08:00:18 +0000 (16:00 +0800)]
Implement Wi-Fi DPP UI.
Add WifiDppEnrolleeActivity
Remove bottom buttons of WifiDppQrCodeScannerFragment
Add ActionBar in WifiDppQrCodeScannerFragment &
WifiDppQrCodeGeneratorFragment
Bug:
118797380
Bug:
118794858
Test: atest WifiDppConfiguratorActivityTest
atest WifiDppQrCodeScannerFragmentTest
atest WifiDppQrCodeGeneratorFragmentTest
atest atest RunSettingsRoboTests
Change-Id: I1d464dc9a8d54a896b8e0c9185a74bed7b193b60
Xin Li [Wed, 12 Dec 2018 00:10:42 +0000 (16:10 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am:
2d744bd9e1 -s ours
am:
2c2f179630 -s ours
Change-Id: I1bba0ad51442e03281b6b668c6a16ced39cc62a8
Xin Li [Tue, 11 Dec 2018 23:54:17 +0000 (15:54 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
am:
2d744bd9e1 -s ours
Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef
Xin Li [Tue, 11 Dec 2018 23:38:49 +0000 (15:38 -0800)]
[automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am:
5134815af5 -s ours
am:
dfd5b86302 -s ours
Change-Id: I620010be975c04bf76e9eee8db22069e34d8237e
Salvador Martinez [Tue, 11 Dec 2018 23:24:53 +0000 (23:24 +0000)]
Merge "Create shell UI for smart battery saver"
TreeHugger Robot [Tue, 11 Dec 2018 23:11:56 +0000 (23:11 +0000)]
Merge "Add edit and delete buttons to zen rules"
Xin Li [Tue, 11 Dec 2018 23:07:53 +0000 (15:07 -0800)]
[automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am:
5134815af5 -s ours
Change-Id: I2bb19a2cb832111ee29ef3762c3b13808dde3b11
TreeHugger Robot [Tue, 11 Dec 2018 21:49:26 +0000 (21:49 +0000)]
Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
Salvador Martinez [Thu, 8 Nov 2018 19:08:52 +0000 (11:08 -0800)]
Create shell UI for smart battery saver
This CL creates the new screen WITHOUT any of the behaviors
(changing the global settings/calling power manager apis) and
hooks it up to the preference in BatterySaverSettings for
navigation. The logic for the preference in BatterySaver Settings
is also added so that it shows the correct summary when the
schedule settings are modified. Additionally, a small tweak is
made to the radio preference widget to make it possible to hide
the appendix view. It didn't seem to do anything except get in
the way and potentially ruin your day, much like its biological
counterpart.
Test: Overriding power mode via adb, robotests
Bug:
111450127
Change-Id: Ic681aaf565ce1caf7d00d314e14ae6c4779fe8f6
Beverly [Tue, 4 Dec 2018 17:32:31 +0000 (12:32 -0500)]
Add edit and delete buttons to zen rules
Test: atest ZenModeScheduleRuleSettingsTest ZenModeEventRuleSettingsTest
Test: manual
Bug:
111475013
Fixes:
120787343
Fixes:
120758763
Change-Id: If81ce2972e6887fb2a85d4b7262e81b26162e19c
Phil Weaver [Tue, 11 Dec 2018 17:15:06 +0000 (17:15 +0000)]
Merge "Clarify text shown in a11y service warning dialog"
tmfang [Tue, 11 Dec 2018 13:49:42 +0000 (21:49 +0800)]
Change LayoutPreference resource path in robo test
Since we change the name of LayoutPreference in SettingsLib,
we also need to change its path for robo test.
Test: robotest
Change-Id: I0401351585564ebfc320c52279af6bfa3b6dbb84
Fixes:
120706174
Inseob Kim [Tue, 11 Dec 2018 11:45:30 +0000 (03:45 -0800)]
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am:
cc24a22da9 -s ours am:
95a1128814 -s ours
am:
fe9f5c42f6 -s ours
Change-Id: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3
Inseob Kim [Tue, 11 Dec 2018 11:34:42 +0000 (03:34 -0800)]
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am:
cc24a22da9 -s ours
am:
95a1128814 -s ours
Change-Id: Id55802e6e5395a0f748f5b125d551b64c22473f1
Inseob Kim [Tue, 11 Dec 2018 11:26:07 +0000 (03:26 -0800)]
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
am:
cc24a22da9 -s ours
Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2
Treehugger Robot [Tue, 11 Dec 2018 11:04:01 +0000 (11:04 +0000)]
Merge "Revert "Revert "Schematize vold system properties"""
Cosmo Hsieh [Tue, 11 Dec 2018 08:21:14 +0000 (08:21 +0000)]
Merge "Rename wifi/NetworkRequestTimeoutDialogFragment to wifi/NetworkRequestErrorDialogFragment for extending usage."
TreeHugger Robot [Tue, 11 Dec 2018 07:11:57 +0000 (07:11 +0000)]
Merge "Add a helper class for listening to subscription and airplane mode changes"
Johnson Lu [Fri, 7 Dec 2018 03:56:49 +0000 (11:56 +0800)]
Implement receiver flow of WiFi sharing feature
1.Add a button to launch QR code scanner when add a network.
2.Scan button added in AddNetworkFragment / WifiDialog / WifiSettings.
Bug:
120630683
Test: make RunSettingsRoboTests
Change-Id: I340bfa2247e092f586dd90dfea37c355e681ffee
Johnson Lu [Tue, 11 Dec 2018 05:51:32 +0000 (05:51 +0000)]
Merge "Implement host flow of WiFi sharing feature"
Leon Liao [Tue, 11 Dec 2018 03:00:44 +0000 (03:00 +0000)]
Merge "Fix content timeout item misorder in Display category in A11y Settings"
Stanley Wang [Tue, 11 Dec 2018 02:22:07 +0000 (02:22 +0000)]
Merge "Fix carrier-specific Wi-Fi settings appears in search - even on non-carrier phone"
Johnson Lu [Wed, 5 Dec 2018 05:45:13 +0000 (13:45 +0800)]
Implement host flow of WiFi sharing feature
Add share button and authentication screen to confirm credentials
(pin, pattern or password) for the current user of the device.
Bug:
120517242
Test: make RunSettingsRoboTests
Change-Id: Id79833db0d582c401f1371ff60429e42ce1990e0
Yueming Wang [Tue, 11 Dec 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Add Cross profile calendar Settings UI."
Xin Li [Mon, 10 Dec 2018 20:43:10 +0000 (12:43 -0800)]
DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug:
120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3
Philip P. Moltmann [Mon, 10 Dec 2018 20:51:31 +0000 (20:51 +0000)]
Merge "RuntimePermissionPresenter was moved"
yuemingw [Wed, 24 Oct 2018 12:02:05 +0000 (13:02 +0100)]
Add Cross profile calendar Settings UI.
Bug:
117976974
Test: make ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest -j40 RunSettingsRoboTests
Change-Id: Ieb4dcfb8091e2c63f4372af220695297c7bb116d
Phil Weaver [Tue, 4 Dec 2018 17:09:49 +0000 (09:09 -0800)]
Clarify text shown in a11y service warning dialog
Replacing the text generated from the service's
capabilities (which could change) with a generic message
based on the maximum capabilities (full control) a service
can obtain.
Bug:
110715236
Test: atest SettingsRoboTests
Change-Id: Iecb548c77c9031626d4da24741ec1f753d0cc94f
TreeHugger Robot [Mon, 10 Dec 2018 18:56:40 +0000 (18:56 +0000)]
Merge "IMM#showInputMethodPickerFromSystem for supporting multi-display."
TreeHugger Robot [Mon, 10 Dec 2018 18:20:09 +0000 (18:20 +0000)]
Merge "Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric""
Fan Zhang [Mon, 10 Dec 2018 18:11:14 +0000 (18:11 +0000)]
Merge "Add a loading text when waiting for wifitracker results"
Inseob Kim [Mon, 10 Dec 2018 07:05:20 +0000 (07:05 +0000)]
Revert "Revert "Schematize vold system properties""
This reverts commit
49e81e0eeac13b1edcd4c8f51c48dafae6336d11.
Reason for revert: Fixed breakage
Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
Yanting Yang [Fri, 7 Dec 2018 12:47:49 +0000 (20:47 +0800)]
Rename ConnectedDeviceSlice to BluetoothDevicesSlice
Bug:
120029006
Test: robotests
Change-Id: I7e39f52a87ebd017bf0635cd5a76945b39eee6fc
Anthony Stange [Mon, 10 Dec 2018 10:15:01 +0000 (02:15 -0800)]
[automerger skipped] Merge "Revert "Schematize vold system properties"" am:
94ef16b6e3 am:
a35a0418c1
am:
c7a5a2f39a -s ours
Change-Id: Ia94db75475da21cbcb87b2db615714473192275d
Cn Chen [Mon, 10 Dec 2018 07:05:24 +0000 (07:05 +0000)]
Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"
This reverts commit
0725bea86e6f7d9de80fad4e3d9c3f6fff338e81.
Reason for revert: Settings crash
Bug:
120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
Stanley Wang [Mon, 3 Dec 2018 10:51:03 +0000 (18:51 +0800)]
Fix carrier-specific Wi-Fi settings appears in search - even on non-carrier phone
The preference should be removed from the search result when
the availability status is false.
Change-Id: I979bc70ec7672b137b96a7e02db2e9ba29fbb7a8
Fixes:
112550245
Test: manual and robotests
TreeHugger Robot [Mon, 10 Dec 2018 02:25:36 +0000 (02:25 +0000)]
Merge "Always save message permission choice"
Cn Chen [Mon, 10 Dec 2018 01:45:28 +0000 (01:45 +0000)]
Merge "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"
Tim Van Patten [Sat, 8 Dec 2018 22:57:34 +0000 (22:57 +0000)]
Merge "Update ANGLE Developer Options"
Yanting Yang [Sat, 8 Dec 2018 15:45:35 +0000 (15:45 +0000)]
Merge "Add pair new device to ConnectedDeviceSlice"
Yanting Yang [Tue, 4 Dec 2018 11:20:32 +0000 (19:20 +0800)]
Add pair new device to ConnectedDeviceSlice
Show "Pair new device" when the number of devices is less than 3.
Bug:
114807655
Test: visual, robotest
Change-Id: Ia8dbff163d758bb077d4960616d1c6538c04aebb
TreeHugger Robot [Sat, 8 Dec 2018 09:32:19 +0000 (09:32 +0000)]
Merge "Update scanning settings to show states in summary"
TreeHugger Robot [Sat, 8 Dec 2018 01:13:24 +0000 (01:13 +0000)]
Merge "Add a helper class for filtering available subscriptions"
TreeHugger Robot [Sat, 8 Dec 2018 00:51:18 +0000 (00:51 +0000)]
Merge "Modified the shadow of the search bar"
Lifu Tang [Thu, 6 Dec 2018 00:06:20 +0000 (16:06 -0800)]
Update scanning settings to show states in summary
Bug:
120220144
Test: build, flash, and test manually
Change-Id: I913d93c2f41e5ffea1d0b9c00d519eba327a0832
Antony Sargent [Fri, 7 Dec 2018 23:40:00 +0000 (15:40 -0800)]
Add a helper class for listening to subscription and airplane mode changes
For the new multi subscriptions UX, in several places we need to listen
for both subscription changes (eg a sim card was inserted or removed),
as well as airplane mode changing state. This combines those in one
helper class that can be reused.
Bug:
116349402
Test: make RunSettingsRoboTests
Change-Id: Ibcbb669ae291a917f89735dbda043742efaa58c9
Antony Sargent [Fri, 7 Dec 2018 19:17:26 +0000 (11:17 -0800)]
Add a helper class for filtering available subscriptions
In several places implementing the new changes for better UX with
multiple mobile subscriptions, we need a bit of code that filters the
results coming from the SubscriptionManager. This CL adds that common
code in a util class that will be used in later CLs.
Bug:
116349402
Test: RunSettingsRoboTests
Change-Id: Ie9376629604ac2c4a2f15123edc380c5999f2f83
Tim Van Patten [Sat, 10 Nov 2018 00:09:44 +0000 (17:09 -0700)]
Update ANGLE Developer Options
Update ANGLE developer options to allow selecting the OpenGL driver
(default, ANGLE, native) for each app as well as forcing ANGLE for all
apps.
The settings are also being moved from within the Android settings (here)
to the ANGLE APK, so they can be updated more quickly/easily.
Bug:
118384925
Test: Verify the default/ANGLE/native values are saved and applied and
used by the loader.
Change-Id: Ide449704dd703657bd316231987a07becf8699c9
Fan Zhang [Thu, 6 Dec 2018 20:45:43 +0000 (12:45 -0800)]
Add a loading text when waiting for wifitracker results
- When there is no result from background worker, a "scanning" text is
displayed instead of a totally empty card.
- Also cleaned up a few minor coding style issues
Change-Id: I73afdb1dd72e7accb387ad9aa493cfbe00bffe66
Fixes:
120051186
Test: robotests
Sunny Shao [Fri, 7 Dec 2018 07:16:56 +0000 (15:16 +0800)]
Modified the shadow of the search bar
Modified the SearchBarStyle and added cardElevation and
enforceMaterialTheme attributes.
Bug:
118886724
Test: manual
Change-Id: If9f39ee5dcc85d837036391ae92aeedd6aea4ab6
TreeHugger Robot [Fri, 7 Dec 2018 19:24:43 +0000 (19:24 +0000)]
Merge "Don't plot usage data beyond current date."
TreeHugger Robot [Fri, 7 Dec 2018 17:08:19 +0000 (17:08 +0000)]
Merge "Update the strings of conditional card"
TreeHugger Robot [Fri, 7 Dec 2018 17:02:11 +0000 (17:02 +0000)]
Merge "Reload data if slice binding returns null at rendering time."
Anthony Stange [Fri, 7 Dec 2018 12:38:25 +0000 (04:38 -0800)]
Merge "Revert "Schematize vold system properties"" am:
94ef16b6e3
am:
a35a0418c1
Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a
Anthony Stange [Fri, 7 Dec 2018 12:30:15 +0000 (04:30 -0800)]
Merge "Revert "Schematize vold system properties""
am:
94ef16b6e3
Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa
Anthony Stange [Fri, 7 Dec 2018 12:04:56 +0000 (12:04 +0000)]
Merge "Revert "Schematize vold system properties""
Anthony Stange [Fri, 7 Dec 2018 11:44:10 +0000 (11:44 +0000)]
Revert "Schematize vold system properties"
This reverts commit
e6baedd917e041576c04687cf20d8d56dd2980fc.
Reason for revert: Breaking aosp_master build
Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b
Mill Chen [Fri, 7 Dec 2018 08:18:32 +0000 (16:18 +0800)]
Update the strings of conditional card
Bug:
113451905
Test: visual
Change-Id: Ie863855eff5a6a23f28b899809e5216c129fb448
TreeHugger Robot [Fri, 7 Dec 2018 04:11:45 +0000 (04:11 +0000)]
Merge "Log contextual card is visible and homepage is displayed event"
Leon Liao [Fri, 7 Dec 2018 03:08:43 +0000 (11:08 +0800)]
Fix content timeout item misorder in Display category in A11y Settings
A11y Content timeout item is disordered by program while device supports HWC
accelerated color transform. Add code to fix its order with present resource order.
Bug:
119283926
Test: atest AccessibilitySettingsTest
Test: make RunSettingsRoboTests
Change-Id: I5e8bff2347353d2c4fe9aa550d7efaa613bf2a90
Inseob Kim [Fri, 7 Dec 2018 03:04:50 +0000 (19:04 -0800)]
[automerger skipped] Merge "Schematize vold system properties" am:
8cf17f7234 am:
09a7954114
am:
cd614a097e -s ours
Change-Id: I2ba852d7747964f530d9616c0eabcd25f211ae0b
Inseob Kim [Fri, 7 Dec 2018 02:43:16 +0000 (18:43 -0800)]
Merge "Schematize vold system properties" am:
8cf17f7234
am:
09a7954114
Change-Id: I1a42e00ad024b471bcc51d8e0ef0f50fea34fcbe
Inseob Kim [Fri, 7 Dec 2018 02:14:00 +0000 (18:14 -0800)]
Merge "Schematize vold system properties"
am:
8cf17f7234
Change-Id: I6d9782dfc2cd54f6620c226d37ca3e81dc19647f
TreeHugger Robot [Fri, 7 Dec 2018 02:05:41 +0000 (02:05 +0000)]
Merge "Show reboot dialog when tunring off developer option"
Yi-Ling Chuang [Thu, 6 Dec 2018 14:13:35 +0000 (22:13 +0800)]
Reload data if slice binding returns null at rendering time.
We are not able to guarantee the binding results in the pre-check and
real binding would always be the same sinc slice may decide what it
would be based on some conditions. Hence, we should reload data and
refresh UI when it comes to null to prevent from blank suggestion.
Bug:
120221527
Test: visual
Change-Id: I79790edfe7fc3af7b9c3b3a7df6a7ffa7d405d50
Treehugger Robot [Fri, 7 Dec 2018 01:46:45 +0000 (01:46 +0000)]
Merge "Schematize vold system properties"
cosmohsieh [Wed, 28 Nov 2018 07:00:43 +0000 (15:00 +0800)]
Rename wifi/NetworkRequestTimeoutDialogFragment to wifi/NetworkRequestErrorDialogFragment for extending usage.
ErrorDialogFragment contains two kinds of error dialog (timeout and onAbort).
Bug:
117399926
Test: RunSettingsRoboTests
Change-Id: Iea82a53baba298de66ae988c75d9fb6daca60160
Doris Ling [Fri, 7 Dec 2018 01:12:05 +0000 (17:12 -0800)]
Don't plot usage data beyond current date.
- the new data usage api returns buckets for future date with 0 usage.
When we plot the data usage chart, need to check the bucket date to make
sure we only plot points up to the current date.
Change-Id: I50e161ca9cdbb30c8fda8f6cdd24c993b546ad0d
Fixes:
120490567
Test: make RunSettingsRoboTests
Raff Tsai [Wed, 5 Dec 2018 11:13:46 +0000 (19:13 +0800)]
Log contextual card is visible and homepage is displayed event
Bug:
79698338
Test: Robolectric
Change-Id: I89ac5ed2765729d8571e84d3a050f0aa07385caa
Chen Xu [Fri, 7 Dec 2018 00:57:04 +0000 (16:57 -0800)]
[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am:
71f9fe4dfa am:
1bf36a6a72
am:
62dc239377 -s ours
Change-Id: I531e7043cb7a385893ede9b27f25f7eabc6bca8a
Chen Xu [Fri, 7 Dec 2018 00:39:36 +0000 (16:39 -0800)]
Merge "address API council feedbacks for Telephony.Carriers" am:
71f9fe4dfa
am:
1bf36a6a72
Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
Chen Xu [Fri, 7 Dec 2018 00:19:11 +0000 (16:19 -0800)]
Merge "address API council feedbacks for Telephony.Carriers"
am:
71f9fe4dfa
Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3
TreeHugger Robot [Thu, 6 Dec 2018 23:57:39 +0000 (23:57 +0000)]
Merge "Allow appending static preferences to RadioButtonPickerFragment"
Doris Ling [Thu, 6 Dec 2018 22:39:27 +0000 (22:39 +0000)]
Merge "Add search to app info list."
TreeHugger Robot [Thu, 6 Dec 2018 22:25:48 +0000 (22:25 +0000)]
Merge "Catch error when we fail to get slice icon."
Salvador Martinez [Tue, 4 Dec 2018 22:13:10 +0000 (14:13 -0800)]
Allow appending static preferences to RadioButtonPickerFragment
This makes it so that static preferences can also be added after
the candidates so they can show up on the bottom of the screen.
This is done via a new xml tag for the preference screen that
is usually mostly empty that RaiodButtonPickerFragments use
Test: robotests
Bug:
111450127
Change-Id: I0fe2f480f0ff59b9bf9269e94b33ab4b008b47b8