OSDN Git Service
TreeHugger Robot [Wed, 30 Jan 2019 03:51:31 +0000 (03:51 +0000)]
Merge "Schematize Crypto system properties"
Les Lee [Wed, 30 Jan 2019 03:42:55 +0000 (03:42 +0000)]
Merge "Use API to get necessary value when activity init"
TreeHugger Robot [Wed, 30 Jan 2019 03:37:42 +0000 (03:37 +0000)]
Merge "Remove cardview wrapper on condition collapse button."
TreeHugger Robot [Wed, 30 Jan 2019 03:22:09 +0000 (03:22 +0000)]
Merge "Remove dead code."
Roshan Pius [Wed, 30 Jan 2019 03:03:20 +0000 (03:03 +0000)]
Merge "AccessPoint: App attribution for suggestion/specifier"
Arc Wang [Wed, 30 Jan 2019 02:29:35 +0000 (02:29 +0000)]
Merge "Set Wi-Fi DPP fragment icons."
Daniel Sandler [Wed, 30 Jan 2019 02:09:54 +0000 (02:09 +0000)]
Merge "Fix dsandler's email address."
Fan Zhang [Wed, 30 Jan 2019 00:33:53 +0000 (16:33 -0800)]
Remove cardview wrapper on condition collapse button.
The cardview is adding a strange background color in dark mode
Change-Id: Id205fbd5209e15597157d86d225f8c6c97a2ec5a
Fixes:
123411225
Test: visual
Fan Zhang [Wed, 30 Jan 2019 00:00:19 +0000 (16:00 -0800)]
Remove dead code.
Bug: n/a
Test: rebuild
Change-Id: I71f8d9d99bbff1186e8df518ec8d27db3447ffbe
TreeHugger Robot [Tue, 29 Jan 2019 23:00:18 +0000 (23:00 +0000)]
Merge "Fix padding problem between search bar and homepage cards"
TreeHugger Robot [Tue, 29 Jan 2019 22:08:33 +0000 (22:08 +0000)]
Merge "Add a plus button to the mobile pref on Network & internet page"
Antony Sargent [Tue, 29 Jan 2019 00:10:58 +0000 (16:10 -0800)]
Add a plus button to the mobile pref on Network & internet page
On the Network & internet page, we have a "Mobile network" pref that in
single-SIM mode leads to a detail page for the current SIM. In multi-SIM
mode it has more complicated behavior (leading either to details about
the current subscription if there is only one, or a list of
subscriptions if more than one).
One of the things we wanted to add was a shortcut to add another eSIM
subscription. So this CL adds a plus button control on the right of the
preference which leads to a flow to add another mobile subscription via
the eSIM manager.
Bug:
116349402
Test: make RunSettingsRoboTests
Change-Id: I38e0031e3bd603e93c45dcb4557750e7bc1b8b5a
Dan Sandler [Tue, 29 Jan 2019 19:41:54 +0000 (14:41 -0500)]
Fix dsandler's email address.
Test: dsandler can give OWNERS approval again
Change-Id: I8a59453ec95b98ce74703bbe003c9039e2a96f22
TreeHugger Robot [Tue, 29 Jan 2019 16:50:23 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Yanting Yang [Tue, 29 Jan 2019 16:44:12 +0000 (16:44 +0000)]
Merge "Sort notification channel in NotificationChannelSlice"
TreeHugger Robot [Tue, 29 Jan 2019 14:58:37 +0000 (14:58 +0000)]
Merge "Enable overlays on background thread."
Yanting Yang [Wed, 23 Jan 2019 14:15:51 +0000 (22:15 +0800)]
Sort notification channel in NotificationChannelSlice
According request to sort the notification channel by average
weekly sent count in descending.
Bug:
119831690
Test: visual, robotests
Change-Id: I96786b077a37dcbc53606f8d98998e01e15b674d
TreeHugger Robot [Tue, 29 Jan 2019 10:51:26 +0000 (10:51 +0000)]
Merge "Game Driver: rename GUP to Game Driver"
Bill Yi [Tue, 29 Jan 2019 09:39:27 +0000 (01:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7a79b6977d8215bcbc7257daaaabfb570862ebbd
Auto-generated-cl: translation import
Arc Wang [Thu, 24 Jan 2019 07:19:23 +0000 (15:19 +0800)]
Set Wi-Fi DPP fragment icons.
1. set fragment icon for WifiDppChooseSavedWifiNetworkFragment
2. set fragment icon of success for WifiDppAddDeviceFragment
All Wi-Fi DPP fragment icons are VectorDrawable of instinct size
24dp draw on a 48dp canvas. Except for ic_devices_check_circle_green,
it's a LayerDrawable of different size. I dynamically change ImageView
layout width & height between these 2 different kind of drawable.
Bug:
122982132
Test: manual test
Change-Id: Idab8cd8b0798363e447da00dc6bc68a86498b8be
lesl [Wed, 2 Jan 2019 10:26:46 +0000 (18:26 +0800)]
Use API to get necessary value when activity init
Framework change intent design from sticky to non-sticky due to
location sensitive data protect. Use APIs to get information when
activity resume.
Intents from sticy to non-sticy:
WifiP2pManager#WIFI_P2P_CONNECTION_CHANGED_ACTION
WifiP2pManager#WIFI_P2P_THIS_DEVICE_CHANGED_ACTION
Bug:
77228252
Test: Manually test Wi-Fi Direct settings
Change-Id: I115515d6832c5c5f290ef9f757ca94afa4e9f1bd
Yanting Yang [Tue, 29 Jan 2019 07:51:33 +0000 (07:51 +0000)]
Merge "Improve UX of Deferred Setup"
Yanting Yang [Fri, 18 Jan 2019 15:39:15 +0000 (23:39 +0800)]
Improve UX of Deferred Setup
Change-Id: I3d0735ef1196b04abaef454529664a8daea53967
Bug:
120485678
Test: visual, robotests
TreeHugger Robot [Tue, 29 Jan 2019 07:06:26 +0000 (07:06 +0000)]
Merge "Game Driver: Add footer to the dashboard"
TreeHugger Robot [Tue, 29 Jan 2019 06:32:34 +0000 (06:32 +0000)]
Merge "Game Driver: Add SwitchBar to control GUP feature"
Pavel Grafov [Tue, 29 Jan 2019 06:14:17 +0000 (22:14 -0800)]
Merge "Update to use new ConnectivityManager API." am:
70b1830e7e am:
7c47743851
am:
3184142cbe
Change-Id: I6bc7277d0f1db1576b369443719c449fc8eeed75
Johnson Lu [Tue, 29 Jan 2019 05:56:55 +0000 (05:56 +0000)]
Merge "Use the UiDevice.setOrientation methods to simulate orienting the device"
Sunny Shao [Mon, 28 Jan 2019 09:46:35 +0000 (17:46 +0800)]
Fix padding problem between search bar and homepage cards
Get the statusbar height dynamically to fix this problem in notch mode.
Change-Id: I4ca0427fc2556f1fb5f868118c5207fdfa035c59
Fixes:
123215804
Test: robotest
Pavel Grafov [Tue, 29 Jan 2019 05:34:50 +0000 (21:34 -0800)]
Merge "Update to use new ConnectivityManager API." am:
70b1830e7e
am:
7c47743851
Change-Id: I41b4f42c88895dd26a65fe0c92b71dbe1e7a3c08
Pavel Grafov [Tue, 29 Jan 2019 04:28:09 +0000 (20:28 -0800)]
Merge "Update to use new ConnectivityManager API."
am:
70b1830e7e
Change-Id: Ide228930858fc8eccfac060858b0da86725f229a
Yiwei Zhang [Thu, 24 Jan 2019 22:04:58 +0000 (14:04 -0800)]
Game Driver: rename GUP to Game Driver
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
Yiwei Zhang [Wed, 23 Jan 2019 20:40:42 +0000 (12:40 -0800)]
Game Driver: Add footer to the dashboard
This change adds a footer to the current dashboard to show some
descriptions when the whole module is turned off.
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: I9788d4c64b06deb099a43e8db7eecab20a85f494
Yiwei Zhang [Sat, 19 Jan 2019 08:45:20 +0000 (16:45 +0800)]
Game Driver: Add SwitchBar to control GUP feature
Uncheck the global switch will hide the preference controllers and force
all apps to use system graphics driver. This change also add a content
observer to notify all the preference controllers of settings global
changes.
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Ice9ded17c759791a3728c552f79881e2215ac081
TreeHugger Robot [Tue, 29 Jan 2019 03:19:21 +0000 (03:19 +0000)]
Merge "Revert "Settings for skip and silence gestures""
TreeHugger Robot [Tue, 29 Jan 2019 02:57:24 +0000 (02:57 +0000)]
Merge "Clean up ShadowUserManager"
TreeHugger Robot [Tue, 29 Jan 2019 02:12:41 +0000 (02:12 +0000)]
Merge "Set correct network type when launching wifi usage data."
TreeHugger Robot [Tue, 29 Jan 2019 01:59:29 +0000 (01:59 +0000)]
Merge "Add isEnabled method to AwareFeatureProvider"
TreeHugger Robot [Tue, 29 Jan 2019 01:29:35 +0000 (01:29 +0000)]
Merge "Add configs to display/hide a few tiles in device info page"
Lei Yu [Tue, 29 Jan 2019 01:29:23 +0000 (01:29 +0000)]
Merge changes Ifb5507cb,Ide044cf9
* changes:
Update BT header using BT metadata
Add layout for advanced BT detail header
Johnson Lu [Fri, 25 Jan 2019 06:34:18 +0000 (14:34 +0800)]
Use the UiDevice.setOrientation methods to simulate orienting the device
The UiDevice methods have a build in call to UiDevice.waitForIdle()
which will block until the UI has not changed for at least 500ms.
Bug:
123382213
Test: atest WifiDppConfiguratorActivityTest
Change-Id: I57539edecfd60f27a061a3ccc263c053ce158855
Hugh Chen [Tue, 29 Jan 2019 00:51:39 +0000 (00:51 +0000)]
Merge changes from topic "media_slice"
* changes:
Implement MediaOutputSlice
Add entry point to launch media output slice
Fan Zhang [Tue, 29 Jan 2019 00:32:56 +0000 (16:32 -0800)]
Clean up ShadowUserManager
Remove addManagedUser() and use default shadow for the same purpose.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=Redaction
Change-Id: I2f86bd51bccbde23a8a37d19b28e30cadb2b9f93
Beverly Tai [Tue, 29 Jan 2019 00:07:06 +0000 (00:07 +0000)]
Revert "Settings for skip and silence gestures"
This reverts commit
d5428a5cd4459067ca71b6dc4935d3f18e520450.
Test: manual, builds
Reason for revert: moving to SettingsGoogle
Change-Id: Iad954e22c9484c2bc059b52e5f17a244be461394
TreeHugger Robot [Mon, 28 Jan 2019 23:53:11 +0000 (23:53 +0000)]
Merge "Add a More item for Special app access page."
TreeHugger Robot [Mon, 28 Jan 2019 22:49:36 +0000 (22:49 +0000)]
Merge "Move SettingsLib icons to android."
Fan Zhang [Mon, 28 Jan 2019 21:10:32 +0000 (13:10 -0800)]
Add configs to display/hide a few tiles in device info page
- Displaying/hiding Emergency info, branded account, device header
widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController
Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes:
119607340
Test: robotests
TreeHugger Robot [Mon, 28 Jan 2019 22:32:29 +0000 (22:32 +0000)]
Merge "Make custom cards title use same font family as slice cards"
Beverly [Mon, 28 Jan 2019 21:47:13 +0000 (16:47 -0500)]
Add isEnabled method to AwareFeatureProvider
Test: manual
Bug:
118388808
Change-Id: I3594d0377efacd5b4558dfaa2dbd91cc925c0b23
Fan Zhang [Mon, 28 Jan 2019 20:54:11 +0000 (12:54 -0800)]
Make custom cards title use same font family as slice cards
Change-Id: I00ab1cd3be7c5a03212371b869e811d6994d1d22
Fixes:
123529477
Test: visual
Amin Shaikh [Mon, 28 Jan 2019 20:31:53 +0000 (15:31 -0500)]
Enable overlays on background thread.
Change-Id: I445022c2f05788f89a7dd412f70229b4874ebda3
Fixes:
112741125
Test: m RunSettingsRoboTests
Pavel Grafov [Mon, 28 Jan 2019 20:15:49 +0000 (20:15 +0000)]
Merge "Update to use new ConnectivityManager API."
Hai Zhang [Thu, 24 Jan 2019 23:53:32 +0000 (15:53 -0800)]
Add a More item for Special app access page.
This allows users to toggle non-exclusive roles, such as the temporary
SMS access (non-exclusive) role.
Bug:
110557011
Test: atest MorePreferenceControllerTest
Change-Id: Id9c0338ef2996aaa741c3da8104e867f32050f3a
Alex Salo [Thu, 17 Jan 2019 21:54:03 +0000 (13:54 -0800)]
Add "Adaptive sleep" setting
Adaptive sleep setting, if enabled, will perform an attention check
right before the power manager is scheduled to dim and then turn off the
display. If the attention check says that user is currently paying
attention to the device, the screen sleep timeout timer will be reset,
as if user had interacted with the display.
The animation and explanation strings are still TBC per UX team.
The setting is only displayed on supported devices.
Test: make RunSettingsRoboTests
Bug:
111939367
Change-Id: I191dd8ef06ecec4edbe4357671a7a9360971c06f
Amin Shaikh [Thu, 24 Jan 2019 23:00:29 +0000 (18:00 -0500)]
Move SettingsLib icons to android.
Bug:
122263617
Test: make
Change-Id: Ia2ab06561824656951fbd0019e9c921442c714e1
Salvador Martinez [Mon, 28 Jan 2019 17:35:41 +0000 (17:35 +0000)]
Merge "Update configurator intent to be public"
TreeHugger Robot [Mon, 28 Jan 2019 16:43:32 +0000 (16:43 +0000)]
Merge "Update DND strings."
jackqdyulei [Wed, 23 Jan 2019 21:00:13 +0000 (13:00 -0800)]
Update BT header using BT metadata
As for unthethered headset, get BT data from BT metadata, rather than
CachedBluetoothDevice
Bug:
122460277
Test: RunSettingsRoboTests
Change-Id: Ifb5507cbbce9602726ba272c12d1bf95eff91001
jackqdyulei [Wed, 9 Jan 2019 00:20:52 +0000 (16:20 -0800)]
Add layout for advanced BT detail header
If device supports metadata, then we display advanced UI in Bluetooth
details header. This CL adds layout for this header.
In advanced layout, it will show:
1. Device name
2. Left, right and case icon
3. Left, right and case battery level
Once API is ready, following CL will get metadata from it and set it
to UI.
Bug:
122460277
Test: RunSettingsRoboTests
Change-Id: Ide044cf9705f350b431b2cb3a9ad82cc4425a17e
Salvador Martinez [Thu, 10 Jan 2019 02:49:27 +0000 (18:49 -0800)]
Update configurator intent to be public
This updates the settings code to use the public intent instead.
Test: tests still pass
Bug: WIP
Change-Id: Id40f60b4c2209073aef8747faa5de4e7ff9692ae
hughchen [Wed, 19 Dec 2018 11:48:51 +0000 (19:48 +0800)]
Implement MediaOutputSlice
Implement MediaOutputSlice that used to show the MediaDevice list and
switch the device to transfer the media.
Bug:
121083246
Test: make -j RunSettingsRoboTests
Change-Id: I0d57cc75ca1fc8eae2d943819f84b1ec8b608255
hughchen [Wed, 19 Dec 2018 11:17:32 +0000 (19:17 +0800)]
Add entry point to launch media output slice
Add media output panel type to launch media output slice.
Bug:
121083246
Test: make -j RunSettingsRoboTests
Change-Id: Ibf706146430e309fef6cbf0e1e86c2d5b78b50d5
Kevin Chyn [Fri, 25 Jan 2019 03:42:05 +0000 (19:42 -0800)]
CDCA is plumbed through BP
CDCA can be invoked with a bundle extra originating from BiometricService.
This allows us to add/forward new BP builder options to CDCA without having
duplicate API each time.
Bug:
111461540
Test: test app, receives correct callbacks
Test: CDC still works
Change-Id: Ia2080d161abba87949338176b34cdf440ed4ed53
Kevin Chyn [Fri, 25 Jan 2019 00:06:55 +0000 (00:06 +0000)]
Revert "Plumb setRequireConfirmation to CC"
This reverts commit
56c745c38e08694367321ac9f24b2a8dc083e024.
Reason for revert: Adding functionality differently
Change-Id: Iadc276ff32b9bef4ea3d7dc6dc051dcfc943e134
TreeHugger Robot [Fri, 25 Jan 2019 21:30:32 +0000 (21:30 +0000)]
Merge "Add "Work profile" section to Languages and input settings"
Pavel Grafov [Fri, 25 Jan 2019 18:58:17 +0000 (18:58 +0000)]
Update to use new ConnectivityManager API.
Bug:
77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a
Matthew Fritze [Fri, 25 Jan 2019 18:27:03 +0000 (18:27 +0000)]
Merge "Add NFC Panel"
Yohei Yukawa [Fri, 25 Jan 2019 18:14:45 +0000 (10:14 -0800)]
Add "Work profile" section to Languages and input settings
This CL adds "Work profile" section to Languages and input settings.
The new section is visible when and only when work profile is enabled.
Hence there should be no user-visible behavior difference when work
profile is not enabled.
If per-profile IME [1] is also enabled, the following 3 preferences
will be shown in the new section.
* Virtual keyboard for work
* Spell checker for work
* Personal dictionary for work
[1]: Ied99664d3dc61b97c919b220c601f90b29761b96
a878b9500e6b89dce9738179edc27bcd0d736b7e
Fix:
120748696
Test: Manually verified as follows.
1. Build and flash an AOSP build
2. adb root
3. adb shell setprop persist.debug.per_profile_ime 1
4. adb reboot
5. Install Test DPC
6. Enable managed profile with Test DPC
7. tapas SoftKeyboard && make -j
8. adb install -r --user 0 $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
9. tapas SampleSpellCheckerService && make -j
10. adb install -r --user 0 \
$OUT/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
11. Open Settings -> System -> Languages & input
12. Virtual Keyboard -> Manage keyboards:
Make sure both "Android Keyboard" and "Sample Soft Keyboard" are shown.
13. Spell checker -> Default spell checker
Make sure "Android Spell Checker" and "Sample correction" are shown.
14. Advanced -> Virtual Keyboard for Work -> Manage keyboards
Make sure that only "Android Keyboard" is shown.
15. Advanced -> Spell checker -> Default spell checker
Make sure that only "Android Spell Checker" is shown.
Change-Id: Id88928318ab1cd92963d652ae39ca772222ea4ac
TreeHugger Robot [Fri, 25 Jan 2019 12:58:27 +0000 (12:58 +0000)]
Merge "Adjust contextual card dismissal view"
Eran Messeri [Fri, 25 Jan 2019 12:27:38 +0000 (12:27 +0000)]
Merge "Further Credentials-related clean-up"
TreeHugger Robot [Fri, 25 Jan 2019 08:42:29 +0000 (08:42 +0000)]
Merge "Filter out unsupported security type for DPP configuration."
Arc Wang [Tue, 22 Jan 2019 10:12:55 +0000 (18:12 +0800)]
Filter out unsupported security type for DPP configuration.
There is different Wi-Fi security support between ZXing's Wi-Fi QR code
format and Wi-Fi DPP QR code format.
ZXing's Wi-Fi QR code format: supports WEP / WPA / none security
Wi-Fi DPP: supports WPA / SAE
So we will have different UI behavior for different security.
WEP & none security: only support QR code generator
WPA: supports both QR code generator & scanner
SAE: only supports QR code scanner
others: don't support. The share button is invisible
Bug:
123212410
Test: manual test
Change-Id: I87962d730282fc2c1b96223dca6feb79235fe5a1
TreeHugger Robot [Fri, 25 Jan 2019 06:03:29 +0000 (06:03 +0000)]
Merge "[Mac Randomization] Change order of Privacy setting in "Add network" page"
TreeHugger Robot [Fri, 25 Jan 2019 05:55:41 +0000 (05:55 +0000)]
Merge "Show Default app shortcut preference only when app is qualified."
cosmohsieh [Thu, 24 Jan 2019 05:39:51 +0000 (13:39 +0800)]
[Mac Randomization] Change order of Privacy setting in "Add network"
page
For better UX, making the default option 'Use randomized MAC (default)' as the
first option item in "add network" page.
Bug:
123160090
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ifdba5a323df21c8d3442f394acdebd1c3f259c69
Cn Chen [Fri, 25 Jan 2019 04:01:30 +0000 (04:01 +0000)]
Merge "[Migration] pass suw extra intent to wallpaper page"
Pasty Chang [Fri, 25 Jan 2019 03:58:56 +0000 (03:58 +0000)]
Merge "Rename ButtonFooterMixin to FooterBarMixin"
TreeHugger Robot [Fri, 25 Jan 2019 03:31:24 +0000 (03:31 +0000)]
Merge "Clean up switchToFragment call."
TreeHugger Robot [Fri, 25 Jan 2019 02:46:39 +0000 (02:46 +0000)]
Merge "Implement WifiNetworkListFragment - Part 3"
Cosmo Hsieh [Fri, 25 Jan 2019 01:44:28 +0000 (01:44 +0000)]
Merge "[Network Connection] Implement dialog title for new design"
TreeHugger Robot [Fri, 25 Jan 2019 01:43:06 +0000 (01:43 +0000)]
Merge "Query correct subscription id for mobile data."
Hai Zhang [Thu, 24 Jan 2019 00:51:40 +0000 (16:51 -0800)]
Show Default app shortcut preference only when app is qualified.
This change uses the new isApplicationQualifiedForRole() API on
PermissionControllerManager to correctly report availability of
default app shortcut preference.
Bug:
110557011
Bug:
123238935
Test: atest DefaultAppShortcutPreferenceControllerBaseTest DefaultSmsShortcutPreferenceControllerTest
Change-Id: Ib86ab0fd84334a149f7c6c3556297745f2990f47
Eran Messeri [Thu, 24 Jan 2019 23:46:53 +0000 (15:46 -0800)]
Merge "Add Enterprise owners for Enterprise settings" am:
35416e7529 am:
74bd41f305
am:
a357cc9737
Change-Id: I9879602947c1060daf319253c2f5422d48d57fbe
Dan Albert [Thu, 24 Jan 2019 23:16:38 +0000 (15:16 -0800)]
Merge "Revert "Update to use new ConnectivityManager API."" am:
9c7ddce334 am:
2105dc52dd
am:
11247ebb53
Change-Id: Id9a817cb440ce1ae538b7f6fd3f5c81a95efb346
Eran Messeri [Thu, 24 Jan 2019 23:11:42 +0000 (15:11 -0800)]
Merge "Add Enterprise owners for Enterprise settings" am:
35416e7529
am:
74bd41f305
Change-Id: I64d13eaab1b8e1a26ef9cadcf6e34c9b65f78076
Doris Ling [Thu, 24 Jan 2019 23:05:55 +0000 (15:05 -0800)]
Set correct network type when launching wifi usage data.
- when launching wifi data usage, need to explicitly set the network
type to wifi. Otherwise, the data usage list will try to show data for
the default mobile data usage.
Change-Id: I819538d2c53664635bc1c2a721d6d7f6799c6123
Fixes:
123205630
Test: make RunSettingsRoboTests
Eran Messeri [Thu, 24 Jan 2019 23:03:28 +0000 (15:03 -0800)]
Merge "Add Enterprise owners for Enterprise settings"
am:
35416e7529
Change-Id: I2823cff17e5b77b3cd449d739c908b0b8c0c9c58
Treehugger Robot [Thu, 24 Jan 2019 22:56:27 +0000 (22:56 +0000)]
Merge "Add Enterprise owners for Enterprise settings"
Christine Franks [Thu, 24 Jan 2019 22:54:09 +0000 (22:54 +0000)]
Merge "Move color modes to ColorDisplayManager"
Doris Ling [Thu, 24 Jan 2019 22:21:18 +0000 (14:21 -0800)]
Query correct subscription id for mobile data.
- On the Data usage settings page, we check for valid subscription id to
determine if we should show the mobile section. However, we are querying
the default subscription id, which will return the 1st id for any
subscription if there's no data subscription. Since this is for mobile
section, we should query the default data subscription id explicitly.
Change-Id: I08c80639d07477e486a2d9a10761e11df4c73b28
Fixes:
119881046
Test: make RunSettingsRoboTests
Dan Albert [Thu, 24 Jan 2019 21:49:58 +0000 (13:49 -0800)]
Merge "Revert "Update to use new ConnectivityManager API."" am:
9c7ddce334
am:
2105dc52dd
Change-Id: I15aa3b38af77c6e222db38b89e3f29562437f4dd
Dan Albert [Thu, 24 Jan 2019 21:39:06 +0000 (13:39 -0800)]
Merge "Revert "Update to use new ConnectivityManager API.""
am:
9c7ddce334
Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355
TreeHugger Robot [Thu, 24 Jan 2019 21:11:07 +0000 (21:11 +0000)]
Merge "Add Subscription ID to extra when start carrier settings activity."
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Update to use new ConnectivityManager API.""
Dan Albert [Thu, 24 Jan 2019 21:06:02 +0000 (21:06 +0000)]
Revert "Update to use new ConnectivityManager API."
This reverts commit
9a9f6f313b1f9bc7a5193eda092ea3ee3ae67667.
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e
Matthew Fritze [Tue, 22 Jan 2019 23:53:37 +0000 (15:53 -0800)]
Add NFC Panel
NFC Panel only shows the NFC setting slice, for now.
Title is "NFC", and See More takes you to the Advanced Device Connectivity
page.
Possibly use cases would be for apps that need to enable NFC for their
peripheral, or accessory.
Test: Manual App
Test: robotest
Change-Id: I8538fd0e4501fb83672418591616f28bf2436645
Fixes:
120142616
Philip P. Moltmann [Thu, 24 Jan 2019 20:51:41 +0000 (20:51 +0000)]
Merge "Assistant is now set as role."
Doris Ling [Thu, 24 Jan 2019 20:50:03 +0000 (20:50 +0000)]
Merge "Hide mainline module apps in settings."
Doris Ling [Thu, 24 Jan 2019 20:20:54 +0000 (20:20 +0000)]
Merge "Add module version in About settings."
Fan Zhang [Thu, 24 Jan 2019 19:07:45 +0000 (19:07 +0000)]
Merge "Remove a window flag."
Pavel Grafov [Thu, 24 Jan 2019 19:02:21 +0000 (11:02 -0800)]
[automerger skipped] Merge "Update to use new ConnectivityManager API." am:
161f5ec3e9 am:
525b0dbc17
am:
a9ed0226f5 -s ours
am skip reason: change_id I614c20b9a1c6748614163766866bb59b15d794f1 with SHA1
ab871a00c7 is in history
Change-Id: I820acb6e661e0cc834b7a6ba42936e1c0e41a009