OSDN Git Service
TreeHugger Robot [Mon, 18 Feb 2019 04:29:26 +0000 (04:29 +0000)]
Merge "[Mac Randomization] Fix MAC randomization option does not work when ephemeral newtork"
TreeHugger Robot [Mon, 18 Feb 2019 04:13:39 +0000 (04:13 +0000)]
Merge "Fix [RTL] Wifi QR Scanner option overlaps wifi Password text"
TreeHugger Robot [Mon, 18 Feb 2019 03:04:05 +0000 (03:04 +0000)]
Merge "Add progress bar for Privacy screen"
cosmohsieh [Tue, 29 Jan 2019 06:50:43 +0000 (14:50 +0800)]
[Mac Randomization] Fix MAC randomization option does not work when
ephemeral newtork
WifiConfiguration is only available when saved network. So ephemeral
newtork could not have wifi config to config wifi setting. In this
situation, making option be not selectable.
Bug:
122919564
Test: atest WifiPrivacyPreferenceControllerTest
Change-Id: I8a2a1c36ec6d41a6f912da29a8b17bc2e43d9a27
Yanting Yang [Mon, 18 Feb 2019 02:46:04 +0000 (02:46 +0000)]
Merge "Hide "Pair new device" from connected device slice"
TreeHugger Robot [Mon, 18 Feb 2019 02:42:33 +0000 (02:42 +0000)]
Merge "Remove feature flags of WiFi Sharing feature"
TreeHugger Robot [Sat, 16 Feb 2019 02:30:16 +0000 (02:30 +0000)]
Merge "Fix failing robotest"
TreeHugger Robot [Sat, 16 Feb 2019 00:38:28 +0000 (00:38 +0000)]
Merge "Move some slice related api out of BasePreferenceController"
Fan Zhang [Fri, 15 Feb 2019 23:46:58 +0000 (15:46 -0800)]
Fix failing robotest
Fixes:
124531152
Test: robotests
Change-Id: I4442ae543b062ef17b4bfd828134ede879d2b22d
TreeHugger Robot [Fri, 15 Feb 2019 23:28:32 +0000 (23:28 +0000)]
Merge "Remove side padding for settings items in bigger screen."
TreeHugger Robot [Fri, 15 Feb 2019 22:46:15 +0000 (22:46 +0000)]
Merge "Fix doubling of channel listing"
TreeHugger Robot [Fri, 15 Feb 2019 22:36:12 +0000 (22:36 +0000)]
Merge "Fix legacy app notification pages"
Fan Zhang [Thu, 14 Feb 2019 23:06:23 +0000 (15:06 -0800)]
Move some slice related api out of BasePreferenceController
And share with CustomSliceable.
Bug:
121150258
Test: rebuild
Change-Id: Ia5aed9c156fb168c1f001da6e37f7f12f191b385
Fan Zhang [Fri, 15 Feb 2019 22:14:22 +0000 (22:14 +0000)]
Merge "Move registered slice set from settings to settingslib."
TreeHugger Robot [Fri, 15 Feb 2019 21:49:23 +0000 (21:49 +0000)]
Merge "Update some string char limits"
Doris Ling [Fri, 15 Feb 2019 21:33:00 +0000 (13:33 -0800)]
Remove side padding for settings items in bigger screen.
Fixes:
110804029
Test: visual in emulator with tablet skin
Change-Id: Ib569731d8cff088c6d110c4ae9d43a7609416238
Julia Reynolds [Fri, 15 Feb 2019 20:15:31 +0000 (15:15 -0500)]
Fix doubling of channel listing
Test: toggle a notification group on/off
Change-Id: Ia93cf8084aee0c886a591301cba764975e5e0147
Fixes:
124384280
Antony Sargent [Fri, 15 Feb 2019 19:37:05 +0000 (11:37 -0800)]
Update some string char limits
We got a bug requesting slightly longer character limits for of the some
new strings used when displaying information in multi-SIM mode.
Bug:
124474015
Test: n/a
Change-Id: I706586b2fc97ae8e6f0e809d2b3b168c7a9353c1
TreeHugger Robot [Fri, 15 Feb 2019 19:09:08 +0000 (19:09 +0000)]
Merge "Check flag to see whether to show accessibility usage dialog."
Maurice Lam [Fri, 15 Feb 2019 18:55:34 +0000 (18:55 +0000)]
Merge "Revert "Revert "Remove TemplateLayout that is not for external use"""
Lei Yu [Fri, 15 Feb 2019 18:26:56 +0000 (18:26 +0000)]
Merge "Update battery summary"
Julia Reynolds [Fri, 15 Feb 2019 18:15:50 +0000 (13:15 -0500)]
Fix legacy app notification pages
Test: view legacy app notification page
Change-Id: Id0d7ac53bc0d9e4d7084bea7ff44d4d8a082cb74
Fixes:
124453411
Joel Galenson [Fri, 15 Feb 2019 16:12:08 +0000 (08:12 -0800)]
Check flag to see whether to show accessibility usage dialog.
Test: Manually set/unset flag, see/don't see dialog.
Test: atest AccessibilityUsagePreferenceControllerTest
Change-Id: I214cf0bf4c67889f48e43fdf774a943dd11e6c34
TreeHugger Robot [Fri, 15 Feb 2019 15:42:35 +0000 (15:42 +0000)]
Merge "Update the summary for DND conditional"
Yanting Yang [Fri, 15 Feb 2019 13:03:54 +0000 (21:03 +0800)]
Hide "Pair new device" from connected device slice
Fixes:
124460897
Test: visual, robotests
Change-Id: Id702bf77eacf29d831e00f56d0b1ab9c1f945fbb
Mill Chen [Wed, 13 Feb 2019 10:48:48 +0000 (18:48 +0800)]
Update the summary for DND conditional
Since original string is too long for DND conditional subtext, separate
DND conditional to two different states, one is for "Phone muted" state,
the othe is for "With exceptions" state.
Also, clean up the strings of other product variants for the conditional.
Bug:
122929205
Test: visual
Change-Id: Icb156ff9a4858a26355d92e6d4fb82ad1927b278
Arc Wang [Fri, 15 Feb 2019 08:30:17 +0000 (16:30 +0800)]
Fix [RTL] Wifi QR Scanner option overlaps wifi Password text
Use android:layout_alignParentStart & android:layout_alignParentEnd
to fix the RTL issue. And refine code of the scanner button.
Bug:
123923904
Test: manual test
Change-Id: I85491b99d22ec303e370422a81a43fc203b695fa
Johnson Lu [Wed, 13 Feb 2019 03:50:11 +0000 (11:50 +0800)]
Remove feature flags of WiFi Sharing feature
Bug:
120744414
Test: Manual
Change-Id: I655ebb8d149d0976063845478bc667cc4d72d96d
Xin Li [Fri, 15 Feb 2019 05:49:04 +0000 (21:49 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master am:
f6aad2aee8 -s ours
am:
82b262afbd -s ours
am skip reason: subject contains skip directive
Change-Id: Ic32a4ab23aa2bdf991881e12bcf99d73be042baa
Android Build Merger (Role) [Fri, 15 Feb 2019 05:28:05 +0000 (05:28 +0000)]
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am:
d61c2adf09 -s ours am:
44ace71846 -s ours am skip reason: subject contains skip directive"
TreeHugger Robot [Fri, 15 Feb 2019 05:14:46 +0000 (05:14 +0000)]
Merge "Use BiometricPrompt description field for CC description instead"
Xin Li [Fri, 15 Feb 2019 05:08:49 +0000 (21:08 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am:
d61c2adf09 -s ours
am:
44ace71846 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b9d869dd64767b498d75f3fe1c9a6746f943b56
TreeHugger Robot [Fri, 15 Feb 2019 03:41:25 +0000 (03:41 +0000)]
Merge "Add null check for CarrierConfig"
jackqdyulei [Fri, 15 Feb 2019 03:11:10 +0000 (19:11 -0800)]
Update battery summary
When it is charging, show "5% - charging"(not only "5%")
Bug:
112013485
Test: RunSettingsRoboTests
Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc
tmfang [Tue, 12 Feb 2019 10:23:20 +0000 (18:23 +0800)]
Add progress bar for Privacy screen
We show up top linear progress bar
when Settings is querying permission usage data.
Test: visual, robotest
Fixes:
123539793
Change-Id: I350068856d1708eb054d2a205d9ca857214891ce
Kevin Chyn [Fri, 15 Feb 2019 01:43:45 +0000 (17:43 -0800)]
Use BiometricPrompt description field for CC description instead
The description field handles longer strings more gracefully
Fixes:
124001277
Test: 1) Open Wi-Fi picker
2) Select gear on the connected network
3) Select share button
4) On BiometricPrompt, text is not cropped
Change-Id: I945830a137a0dc203bba04728b507ceff020dfdc
Xin Li [Fri, 15 Feb 2019 01:18:04 +0000 (17:18 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
am:
f6aad2aee8 -s ours
am skip reason: subject contains skip directive
Change-Id: I4bf7e0d090e49c1273ca1ad81bffe26825e34e47
Fan Zhang [Fri, 15 Feb 2019 00:51:12 +0000 (00:51 +0000)]
Merge "Do not allow draw on top for default sms picker."
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Lei Yu [Fri, 15 Feb 2019 00:06:59 +0000 (00:06 +0000)]
Merge "Adjust layout padding for SlicePreference"
Fan Zhang [Thu, 14 Feb 2019 22:31:11 +0000 (14:31 -0800)]
Move registered slice set from settings to settingslib.
Bug:
121150258
Test: robotests
Change-Id: I32263de9a755e8902c820fda36096b821a293bcb
Fan Zhang [Thu, 14 Feb 2019 23:13:44 +0000 (23:13 +0000)]
Merge "Mass clean up: don't cast class when not needed."
Xin Li [Thu, 14 Feb 2019 22:41:06 +0000 (14:41 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am:
d61c2adf09 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia83108724808a1bb96ed25b0607545bda5abb7b9
jackqdyulei [Mon, 11 Feb 2019 20:26:18 +0000 (12:26 -0800)]
Adjust layout padding for SlicePreference
To make sure text align to other preferences. This CL also
update related style name.
Bug:
124234686
Test: Manual
Change-Id: I9df8ba15630fce5509a8c8a1cbc17f103fcc6481
Xin Li [Thu, 14 Feb 2019 22:11:39 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
Maurice Lam [Thu, 14 Feb 2019 22:04:30 +0000 (22:04 +0000)]
Revert "Revert "Remove TemplateLayout that is not for external use""
This reverts commit
0111db7181471cbf0e2f724026dba11f92dbe5cd.
Reason for revert: Roll forward
Change-Id: I0a7642915dbf3b16115456ab9c264cf1acf93d01
Maurice Lam [Thu, 14 Feb 2019 22:03:58 +0000 (22:03 +0000)]
Merge "Revert "Remove TemplateLayout that is not for external use""
Maurice Lam [Thu, 14 Feb 2019 22:01:10 +0000 (22:01 +0000)]
Revert "Remove TemplateLayout that is not for external use"
This reverts commit
39b02386f7ca93792d4261103b5b90c777d7dc8e.
Reason for revert: b/
124450605
Change-Id: I3b2d66c87dc645da0d4e8ded798a1b80381523cf
Brad Ebinger [Thu, 14 Feb 2019 21:23:41 +0000 (13:23 -0800)]
[automerger skipped] Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8 am:
ee4a5291a1
am:
9f2b104953 -s ours
am skip reason: change_id I2af91c3734274f0aea942a8bb894d6f4ce295354 with SHA1
69dbf4bf84 is in history
Change-Id: Ie9a3d60d7ca4deb8e4e43e45a03e52191344962d
Brad Ebinger [Thu, 14 Feb 2019 21:19:37 +0000 (13:19 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8
am:
ee4a5291a1
Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
Brad Ebinger [Thu, 14 Feb 2019 21:15:44 +0000 (13:15 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am:
db7da4cba8
Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
TreeHugger Robot [Thu, 14 Feb 2019 21:04:32 +0000 (21:04 +0000)]
Merge "Add accessibility usage preference to the Privacy screen."
Brad Ebinger [Thu, 14 Feb 2019 21:01:05 +0000 (21:01 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
TreeHugger Robot [Thu, 14 Feb 2019 20:43:23 +0000 (20:43 +0000)]
Merge "Apply new slice attributes to customize layout"
jackqdyulei [Thu, 14 Feb 2019 19:30:02 +0000 (11:30 -0800)]
Add null check for CarrierConfig
CarrierConfig maybe null when config loader is not ready, so we need
to add null check here.
Bug:
124447166
Test: RunSettingsRoboTests
Change-Id: I3c104f1ca44bb0bcacad460c68084163c758746a
Fan Zhang [Thu, 14 Feb 2019 20:25:29 +0000 (12:25 -0800)]
Mass clean up: don't cast class when not needed.
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
Brad Ebinger [Thu, 14 Feb 2019 18:54:55 +0000 (18:54 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
TreeHugger Robot [Thu, 14 Feb 2019 18:24:40 +0000 (18:24 +0000)]
Merge "Updated screen lock type picker footer strings"
TreeHugger Robot [Thu, 14 Feb 2019 18:03:19 +0000 (18:03 +0000)]
Merge "Fix only one "active" HA showing under Accessibility Settings"
Bernard Chau [Mon, 11 Feb 2019 16:26:56 +0000 (16:26 +0000)]
Updated screen lock type picker footer strings
Bug:
111173457
Test: N/A
Change-Id: I5a4fe3d6e35cd8ae068f2235faa302c8a5c03c97
Jason Chiu [Thu, 14 Feb 2019 09:00:35 +0000 (17:00 +0800)]
Apply new slice attributes to customize layout
Fixes:
114807643
Test: robotest
Change-Id: I6c3975f08268cb831627f63c241428ae4574af1f
Xin Li [Tue, 12 Feb 2019 22:54:28 +0000 (14:54 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug:
124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
markchien [Thu, 14 Feb 2019 06:43:11 +0000 (22:43 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627 am:
2ee5beaa32
am:
c77ee11e4e
Change-Id: Ib14b4a7b3a5b8eb23c7229318ecd785605e1a4f0
markchien [Thu, 14 Feb 2019 06:39:00 +0000 (22:39 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627
am:
2ee5beaa32
Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am:
f1e3e9d627
Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix wrong TetherProvisioningActivity definition"
TreeHugger Robot [Thu, 14 Feb 2019 04:58:05 +0000 (04:58 +0000)]
Merge "Check for null before invoking finish()"
Pasty Chang [Thu, 14 Feb 2019 04:03:43 +0000 (04:03 +0000)]
Merge "Remove TemplateLayout that is not for external use"
markchien [Thu, 14 Feb 2019 03:11:31 +0000 (11:11 +0800)]
Fix wrong TetherProvisioningActivity definition
Bug:
122108346
Bug:
120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
Malcolm Chen [Wed, 13 Feb 2019 01:02:34 +0000 (17:02 -0800)]
Don't show hidden subscriptions.
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.
Bug:
121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
Kevin Chyn [Thu, 14 Feb 2019 02:23:08 +0000 (18:23 -0800)]
Check for null before invoking finish()
Fixes:
124406109
Test: manual
Change-Id: Idee87c060ffd84395355ccdc5248166f1a6aeaf0
TreeHugger Robot [Thu, 14 Feb 2019 01:36:30 +0000 (01:36 +0000)]
Merge "Add logging for SettingsPanels"
timhypeng [Wed, 13 Feb 2019 06:42:39 +0000 (14:42 +0800)]
Fix only one "active" HA showing under Accessibility Settings
-return main device on getConnectedHearingAidDevice()
-add test case
Bug:
123777253
Test: make -j42 RunSettingsRoboTests
Change-Id: I63522311b2248df983f200864b5465c0055056da
TreeHugger Robot [Thu, 14 Feb 2019 01:25:39 +0000 (01:25 +0000)]
Merge "Robotest fix."
Hall Liu [Thu, 14 Feb 2019 01:17:51 +0000 (17:17 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3 am:
5232a30b03
am:
89b61e8e0a
Change-Id: Id7ff8fadb12185700859ceea48e3ddc6db4688bd
Hall Liu [Thu, 14 Feb 2019 00:33:22 +0000 (16:33 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3
am:
5232a30b03
Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
Hall Liu [Thu, 14 Feb 2019 00:14:10 +0000 (16:14 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
am:
a23ceba5c3
Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
Matthew Fritze [Fri, 8 Feb 2019 22:09:35 +0000 (14:09 -0800)]
Add logging for SettingsPanels
The 3 main categories are:
- Panel Opened
- Panel Closed
- Panel Slice interaction
There are 3 close events:
- See more button
- Done button
- Clicking outside the panel
Slice interactions will log the Uri of the Slice and the ActionType,
such as Toggle, Slider, Content (intent).
Change-Id: Iecad948f39f50dd12ae1bcb23a5d523e0df8bb98
Fixes:
117804231
Test: robotests
Alex Buynytskyy [Wed, 13 Feb 2019 23:55:38 +0000 (15:55 -0800)]
Robotest fix.
Repro: m dist RunSettingsRoboTests ROBOTEST_FILTER=widget
Test: Robolectric test
Change-Id: I4bd4be29ac28d7532bba8aa26d70758c58bd9a0e
TreeHugger Robot [Wed, 13 Feb 2019 23:47:33 +0000 (23:47 +0000)]
Merge "Remove weird background color on stroage donut in dark mode"
TreeHugger Robot [Wed, 13 Feb 2019 23:42:22 +0000 (23:42 +0000)]
Merge "Make WakeScreen conditionally avaialable"
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
TreeHugger Robot [Wed, 13 Feb 2019 22:53:04 +0000 (22:53 +0000)]
Merge "User photo: Remove reference to Photo Gallery"
Lei Yu [Wed, 13 Feb 2019 22:43:22 +0000 (22:43 +0000)]
Merge "Update search for mobile network"
Fan Zhang [Wed, 13 Feb 2019 22:01:00 +0000 (14:01 -0800)]
Remove weird background color on stroage donut in dark mode
Bug:
124313940
Test: visual
Change-Id: Ie95c98c23bb67570418e49a1c6677d4b6809b5d2
TreeHugger Robot [Wed, 13 Feb 2019 21:45:25 +0000 (21:45 +0000)]
Merge "Change the default snoop log level to off."
Lucas Dupin [Wed, 13 Feb 2019 21:08:09 +0000 (13:08 -0800)]
Make WakeScreen conditionally avaialable
Also moving the setting closer to 'Always On'
Fixes:
124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
TreeHugger Robot [Wed, 13 Feb 2019 21:35:10 +0000 (21:35 +0000)]
Merge "Update the font family for the conditional title"
TreeHugger Robot [Wed, 13 Feb 2019 21:11:15 +0000 (21:11 +0000)]
Merge "Make card bacground grey_900 instead of 800 in dark mode"
TreeHugger Robot [Wed, 13 Feb 2019 19:56:35 +0000 (19:56 +0000)]
Merge "Set default background color for home icon."
Fan Zhang [Wed, 13 Feb 2019 19:16:00 +0000 (11:16 -0800)]
Make card bacground grey_900 instead of 800 in dark mode
Change-Id: I7ccd59984949620340ebe66710b7956acde3e381
Fixes:
124313940
Test: visual
Fan Zhang [Wed, 13 Feb 2019 18:43:46 +0000 (10:43 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82 am:
32fbf4740d
am:
798c93aafc
Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
Alex Salo [Wed, 13 Feb 2019 18:32:48 +0000 (18:32 +0000)]
Merge "Add more keywords to adaptive sleep setting"
Fan Zhang [Wed, 13 Feb 2019 18:29:46 +0000 (10:29 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82
am:
32fbf4740d
Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
Fan Zhang [Wed, 13 Feb 2019 18:16:15 +0000 (10:16 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am:
dabfd96c82
Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 17:59:40 +0000 (17:59 +0000)]
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit
910457e37a45c4c717466aadfdf9d3fcd62135d4.
Fixes:
124370422
Reason for revert: b/
124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%
22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
TreeHugger Robot [Wed, 13 Feb 2019 13:53:56 +0000 (13:53 +0000)]
Merge "Move horizontal progress bar into SettingsLib."
Mill Chen [Wed, 13 Feb 2019 08:46:47 +0000 (16:46 +0800)]
Update the font family for the conditional title
Bug:
113451905
Test: visual
Change-Id: Ic58652f4ac3af0e72308a7c2c293b2ae73eb42b6
TreeHugger Robot [Wed, 13 Feb 2019 05:44:06 +0000 (05:44 +0000)]
Merge "Fix some problems with the "Mobile network" preference"