OSDN Git Service
Jason Chiu [Wed, 18 Jul 2018 08:39:29 +0000 (16:39 +0800)]
Delegate PrintServicesLoader to the framework's one
1. Remove the duplicated PrintServicesLoader in Settings
2. Make a androidx.loader in Settings and internally just delegate all calls to the real PrintServicesLoader
3. Get the result from the real loader
Test: manual
Fixes:
111581651
Change-Id: I2a9b3653f5c68f8383a468cd16ef5f7c3fd4bc3a
TreeHugger Robot [Thu, 19 Jul 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Use the migrated injected setting code in settingslib. Manual merge to master from pi-car-dev Bug:
68198078 Test: Tested on device Change-Id: Iff767cd6bf7408b45ce9594628d3fd0a71744e9f"
Raff Tsai [Thu, 19 Jul 2018 01:00:28 +0000 (01:00 +0000)]
Merge "Fix AlertDialog corner and color accent"
TreeHugger Robot [Thu, 19 Jul 2018 00:25:14 +0000 (00:25 +0000)]
Merge "Convert SavedAccessPoints to DashboardFragment (step 1)"
TreeHugger Robot [Wed, 18 Jul 2018 23:32:10 +0000 (23:32 +0000)]
Merge "Clean up saved network screen"
Fan Zhang [Wed, 18 Jul 2018 22:46:49 +0000 (15:46 -0700)]
Convert SavedAccessPoints to DashboardFragment (step 1)
Change-Id: I5d8fa8497e04c9314dead9af7534df4507ffd591
Bug:
64806699
Test: robotest
Fan Zhang [Wed, 18 Jul 2018 21:31:44 +0000 (14:31 -0700)]
Clean up saved network screen
Bug:
64806699
Test: rebuild
Change-Id: I4392809f08034c7c13575db2f5c41468fcea0987
TreeHugger Robot [Wed, 18 Jul 2018 20:43:38 +0000 (20:43 +0000)]
Merge "Unrestrict SMS/PHONE app if it been set active"
Aarthi Balachander [Wed, 11 Jul 2018 00:04:53 +0000 (17:04 -0700)]
Use the migrated injected setting code in settingslib.
Manual merge to master from pi-car-dev
Bug:
68198078
Test: Tested on device
Change-Id: Iff767cd6bf7408b45ce9594628d3fd0a71744e9f
jackqdyulei [Fri, 13 Jul 2018 21:50:04 +0000 (14:50 -0700)]
Unrestrict SMS/PHONE app if it been set active
If an app been set default SMS/PHONE app, we need to unrestrict this
app. This CL extract a common function and invoke it when necessary.
Change-Id: Id29c5138438aa6f6f22cdd9c4ecf336de8481782
Fixes:
80305978
Test: robotests
TreeHugger Robot [Wed, 18 Jul 2018 16:30:31 +0000 (16:30 +0000)]
Merge "Fix test cases broken"
TreeHugger Robot [Wed, 18 Jul 2018 14:45:20 +0000 (14:45 +0000)]
Merge "Disable notification settings access from work apps."
Irina Dumitrescu [Mon, 9 Jul 2018 20:12:17 +0000 (21:12 +0100)]
Disable notification settings access from work apps.
Fixes:
79241388
Test: the following command does not open the notification settings in
work profile user:
$ adb shell am start --user $USER -W -a android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS
Moreover, triggering the notifications from a sample app results in the
new toast being displayed.
Change-Id: I0a330a9cf22c813aea7600557660868263817e1e
tmfang [Tue, 17 Jul 2018 01:54:14 +0000 (09:54 +0800)]
Fix test cases broken
- AndroiX AlertDialog needs to use Theme.AppCompat.
- Create a ShadowAlertDialogCompat which can be compatible with AndroidX AlertDialog.
Fix:
111247403
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.password.ChooseLockTypeDialogFragmentTest
Change-Id: I3e4bca285ecaefa5705c8d170050c21d1bc649e0
Raff Tsai [Tue, 17 Jul 2018 01:59:58 +0000 (09:59 +0800)]
Fix AlertDialog corner and color accent
- Add some attributes in Theme.AlertDialog
Change-Id: Ifb9ca98ee11f6c82cda4a576d10b5fde54f788be
Fixes:
110917586
Test: mannual
TreeHugger Robot [Wed, 18 Jul 2018 07:38:38 +0000 (07:38 +0000)]
Merge "Remove LocalePickerWithRegion class in Settings."
Jackal Guo [Wed, 18 Jul 2018 05:37:08 +0000 (05:37 +0000)]
Merge "Change the order of preferences in a11y"
TreeHugger Robot [Wed, 18 Jul 2018 00:59:41 +0000 (00:59 +0000)]
Merge "Remove unused battery strings"
TreeHugger Robot [Wed, 18 Jul 2018 00:25:26 +0000 (00:25 +0000)]
Merge "Remove ListView from preference_list_fragment."
jackqdyulei [Tue, 17 Jul 2018 23:27:46 +0000 (16:27 -0700)]
Remove unused battery strings
Change-Id: Ic463c353837078e6d5b960b458e210174b50fa37
Fixes:
36738738
Test: Build
Fan Zhang [Tue, 17 Jul 2018 16:11:59 +0000 (09:11 -0700)]
Remove ListView from preference_list_fragment.
As part of it, Use RecyclerView in PrintServiceSettingsFragment, which
still depends on the old preference_list_frag layout.
Also remove some unused pngs
Test: manual
Change-Id: I3189bd0dee5b6a74209eb1e707eb40427c96e312
Salvador Martinez [Tue, 17 Jul 2018 22:45:29 +0000 (15:45 -0700)]
Fix dialogs in Theme.Settings
Theme.Settings was explicitly using a Light theme. This CL
changes it to DayNight so that it properly changes colors in
night mode.
Test: visual inspection, screenshot
Bug:
111397440
Change-Id: I20088a9021ddfe7d6e92c3b52ce4ca65ada07983
TreeHugger Robot [Tue, 17 Jul 2018 22:00:15 +0000 (22:00 +0000)]
Merge "Fix the title mismatch bug of Languages sub-settings page."
TreeHugger Robot [Tue, 17 Jul 2018 21:09:36 +0000 (21:09 +0000)]
Merge changes from topic "rm_odr_anomaly"
* changes:
Move anomaly code to BatteryTipUtils
Remove the anomaly detection added in O-DR
jackqdyulei [Fri, 13 Jul 2018 00:06:42 +0000 (17:06 -0700)]
Move anomaly code to BatteryTipUtils
Then we could reuse it across settings.
Bug:
74529048
Test: robo test that cover each components still pass
Change-Id: Ied0bbc6e6a1dca9628c2c084c3284ffab2f85160
jackqdyulei [Thu, 12 Jul 2018 22:16:30 +0000 (15:16 -0700)]
Remove the anomaly detection added in O-DR
1. Remove unused class and resources
2. Update function in AdvancedPowerUsageDetail since
we don't need pass in anomaly anymore
Change-Id: I96fbe5ddaae902b34b756c7aae0338e49afef1f3
Bug:
74529048
Test: 1. manual test in settings page. 2. robo test still pass
TreeHugger Robot [Tue, 17 Jul 2018 19:30:39 +0000 (19:30 +0000)]
Merge "Allow activity to delegate onActivityResult to fragments"
Yanting Yang [Tue, 17 Jul 2018 10:09:57 +0000 (18:09 +0800)]
Fix the title mismatch bug of Languages sub-settings page.
- modify the title of Language sub-settings page.
- remove the unused string id, pref_title_lang_selection.
Change-Id: I445493f6769c9888a27b72471fc9282df3655406
Fixes:
111322494
Test: manual
Fan Zhang [Tue, 17 Jul 2018 17:12:30 +0000 (10:12 -0700)]
Allow activity to delegate onActivityResult to fragments
Change-Id: Iac388f1726269239313d666f3123f28348e0c90a
Fixes:
111531567
Test: rototests
jackqdyulei [Fri, 13 Jul 2018 20:23:33 +0000 (13:23 -0700)]
Add scrollview for dns dialog
Also update dialog to appcompat to avoid the crash
Change-Id: Ide6483f1160713dae8111de533a8b3345a3420c2
Fixes:
111351793
Test: Manual
tmfang [Fri, 13 Jul 2018 03:11:26 +0000 (11:11 +0800)]
Remove LocalePickerWithRegion class in Settings.
This class is too complex, we can't afford maintaining this long term.
We need a new Activity that wraps the framework version of LocalePickerWithRegion.
Bug:
111373939
Test: manual test & make RunSettingsRoboTests -j56
Change-Id: I93c719246b84350d2eee4e8ce1ffd97cd168925b
Jason Chiu [Tue, 17 Jul 2018 03:53:49 +0000 (11:53 +0800)]
Fix a test broken by fragment migration.
Test: make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
111194177
Change-Id: Ifd2d980bbf397ad9875b43d654ab4fc52c4627c2
Jackal Guo [Tue, 17 Jul 2018 02:15:19 +0000 (10:15 +0800)]
Change the order of preferences in a11y
Some preference items have the same order, and it makes these items
be sorted in different position per languages. Use unique order for
each items instead.
Bug:
77949267
Test: atest CtsAccessibilityTestCases
Test: manual check the order in different languages
Change-Id: Ibfcb316c4299266b053053d9d88819a7dcc158fa
TreeHugger Robot [Tue, 17 Jul 2018 02:33:50 +0000 (02:33 +0000)]
Merge "Move non-theme styles to styles.xml"
Fan Zhang [Mon, 16 Jul 2018 23:28:37 +0000 (16:28 -0700)]
Move non-theme styles to styles.xml
1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources
Bug:
111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a
TreeHugger Robot [Tue, 17 Jul 2018 00:23:46 +0000 (00:23 +0000)]
Merge "Remove more unused theme customization"
TreeHugger Robot [Tue, 17 Jul 2018 00:21:23 +0000 (00:21 +0000)]
Merge "Add a back-up icon resource to icon-less Slices"
Fan Zhang [Mon, 16 Jul 2018 21:29:39 +0000 (14:29 -0700)]
Remove more unused theme customization
Bug:
111454230
Test: manual
Change-Id: I704247ffe1092165365f7604f17372c79afd46ed
Matthew Fritze [Fri, 13 Jul 2018 21:05:38 +0000 (14:05 -0700)]
Add a back-up icon resource to icon-less Slices
Currently, when a Settings Slice dosen't have an icon, we add an IconCompat
object with the resource 0x0 - which gives an empty icon. This is from the UX
direction that we should only have icons for Settings Slices when the
corresponding Settings have icons in the Settings UI.
However, this causes an issue with a recent change to SliceView, which crashes
the UI when a Slice is rendered without an icon. Previously, the icon code path
was only exercised when the Slice Shortcut view was being used, but after the
change, the icon path is always used and thus crashes when trying to fetch a
resource with id 0x0 from Settings or another provider.
About 2/3rds of Settings Slices do not have icons.
This change adds the Settings App icon as the back-up icon for any Slice which
would otherwise not have an icon.
The impact of missing this change is:
- Settings Slices cannot be shown in launcher spaces until a post-P update comes
from the support library.
- If Settings launches with the bug, Slices cannot patch the API which would require
all Slices to have a non empty icon (b/
111438616)
Bug:
111082093
Test: Robotests, Settings Search UI testing, Slice browser testing
Change-Id: I6f326b6b41bf59011a211c6340dd639f68e754e1
TreeHugger Robot [Mon, 16 Jul 2018 22:12:05 +0000 (22:12 +0000)]
Merge "Clean up theme part 1: move attrs to attrs.xml"
Brad Ebinger [Mon, 16 Jul 2018 21:21:57 +0000 (14:21 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API." am:
9e4ff6fca6 am:
15ca33865c
am:
aca1e304bd
Change-Id: I0b3b6198e895caf4c33354ffb2fc20b599540387
TreeHugger Robot [Mon, 16 Jul 2018 21:08:21 +0000 (21:08 +0000)]
Merge "Fix a incorrect type cast for alert dialog"
Fan Zhang [Mon, 16 Jul 2018 19:33:36 +0000 (12:33 -0700)]
Clean up theme part 1: move attrs to attrs.xml
And remove unused theme and layouts.
Bug:
111454230
Test: rebuild
Change-Id: Iaf418a9a3dc014fc0eac096e60b0e4581c6ededb
Brad Ebinger [Mon, 16 Jul 2018 20:55:25 +0000 (13:55 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API." am:
9e4ff6fca6
am:
15ca33865c
Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
Brad Ebinger [Mon, 16 Jul 2018 20:32:55 +0000 (13:32 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API."
am:
9e4ff6fca6
Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
Brad Ebinger [Mon, 16 Jul 2018 19:57:31 +0000 (19:57 +0000)]
Merge "IMS: Use the slot based ImsManager factory reset API."
Fan Zhang [Mon, 16 Jul 2018 19:18:32 +0000 (12:18 -0700)]
Fix a incorrect type cast for alert dialog
Change-Id: I2265c4510785f88ef7950cd29779848eb2e58dc4
Fixes:
111488148
Test: manual
Doris Ling [Mon, 16 Jul 2018 18:51:46 +0000 (11:51 -0700)]
[automerger skipped] DO NOT MERGE Fix summary text for advanced button. am:
20e7c9d0ba -s ours
am:
ca9617ac6b -s ours
Change-Id: I163ccd679b9321013ec064172442146e732d8e3e
Doris Ling [Mon, 16 Jul 2018 18:46:54 +0000 (11:46 -0700)]
[automerger skipped] DO NOT MERGE Fix summary text for advanced button.
am:
20e7c9d0ba -s ours
Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6
TreeHugger Robot [Sat, 14 Jul 2018 02:46:16 +0000 (02:46 +0000)]
Merge "Remove custom style for preferenceFragmentStyle"
Fan Zhang [Sat, 14 Jul 2018 00:48:35 +0000 (17:48 -0700)]
Remove custom style for preferenceFragmentStyle
Bug:
111454230
Test: manual
Change-Id: I84d3ba3876c636461afaeb6d77a8a759b339f733
TreeHugger Robot [Fri, 13 Jul 2018 22:56:18 +0000 (22:56 +0000)]
Merge "Fix incorrect imports for AlertDialog"
Fan Zhang [Fri, 13 Jul 2018 21:51:18 +0000 (21:51 +0000)]
Merge "Fix a crash when trying to find fingerprint sensor"
TreeHugger Robot [Fri, 13 Jul 2018 21:27:19 +0000 (21:27 +0000)]
Merge "Disallow VoiceInteractionService as assist on LowMemDevice"
Fan Zhang [Fri, 13 Jul 2018 21:21:15 +0000 (14:21 -0700)]
Fix incorrect imports for AlertDialog
Test: robotests
Change-Id: Ic17121cfd4dbe2d15f6d2250649cc71b82aa2c15
TreeHugger Robot [Fri, 13 Jul 2018 21:11:26 +0000 (21:11 +0000)]
Merge "Clean up: fix incorrect @VisibleForTesting imports"
Jordan Liu [Fri, 13 Jul 2018 20:57:52 +0000 (20:57 +0000)]
Merge "Preserve leading 0s in mcc mnc"
Fan Zhang [Fri, 13 Jul 2018 20:32:57 +0000 (13:32 -0700)]
Fix a crash when trying to find fingerprint sensor
Change-Id: I5bd237fde6d08ace7f8910808a88ba7b62610cba
Fixes:
111443778
Test: manual
Fan Zhang [Fri, 13 Jul 2018 20:06:24 +0000 (13:06 -0700)]
Clean up: fix incorrect @VisibleForTesting imports
Test: rebuild and robotests
Change-Id: I33d7ee1c0622c01f592920baaf01d44ad19d9a13
Fan Zhang [Fri, 13 Jul 2018 19:55:50 +0000 (12:55 -0700)]
Disallow VoiceInteractionService as assist on LowMemDevice
Bug:
111443156
Test: robotests
Change-Id: Ic3413af2b5450c43c4749b7748b676a01209a5ac
Doris Ling [Fri, 13 Jul 2018 19:32:00 +0000 (12:32 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes:
111195268
Test: manual
Hall Liu [Fri, 13 Jul 2018 18:41:21 +0000 (11:41 -0700)]
Fix usage of SubscriptionInfo ctor am:
f0072b7345
am:
f9b76dfda1
Change-Id: I73d41c06ee5006310ccc5b0ece5b73919370231f
Hall Liu [Fri, 13 Jul 2018 18:27:19 +0000 (11:27 -0700)]
Fix usage of SubscriptionInfo ctor
am:
f0072b7345
Change-Id: I0ec1335abfef8fc30c638636e3bb1ac24a221743
Jordan Liu [Fri, 13 Jul 2018 17:43:47 +0000 (10:43 -0700)]
Preserve leading 0s in mcc mnc
Fixes:
79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
TreeHugger Robot [Fri, 13 Jul 2018 17:20:48 +0000 (17:20 +0000)]
Merge "Fix 2 tests broken by fragment migration."
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
hughchen [Thu, 5 Jul 2018 06:59:57 +0000 (14:59 +0800)]
Use corresponding profile to get active bluetooth device
- Do not use streamType to decide which active device should return.
Base on b/
80453878 comment#6, the steamType intent will only be sent
if an action is made on stream volume or a media route is changed:
For instance when a call to setStreamVolume() or getDeviceForStream() is made.
It is not broadcast on actual routing changes.
It should not be used as an indicator that the route changed during a call.
There is no callback API and the only option is polling with getDeviceForStream().
- Use corresponding profile to get active bluetooth device
instead of streamType
- Add test to verify the result of findActiveDevice()
eg:
1. A2dp device active, hearing aid device not active : return a2dp device
2. A2dp device not active, hearing aid device not active : return null
3. hfp device active, hearing aid device not active : return hfp device
4. hfp device not active, hearing aid device not active : return null
Bug:
80453878
Test: make -j42 RunSettingsRoboTests
Change-Id: I5bd94899a5d508e60ce911da9689b727ad1fc20c
Hall Liu [Fri, 13 Jul 2018 04:15:24 +0000 (21:15 -0700)]
Fix usage of SubscriptionInfo ctor
am:
1b3985010d
Change-Id: Ie4c85110eb1f9de5c8d7aba2f76b076b622872e3
TreeHugger Robot [Fri, 13 Jul 2018 01:09:39 +0000 (01:09 +0000)]
Merge "Fix crash when starting daydream setting with wrong context"
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
Xiangyu/Malcolm Chen [Fri, 13 Jul 2018 00:09:12 +0000 (00:09 +0000)]
Merge "Fix bug of phoneListener always listens to default subId in WFC."
Fan Zhang [Thu, 12 Jul 2018 23:38:26 +0000 (16:38 -0700)]
Fix 2 tests broken by fragment migration.
Change-Id: Ieda64e5c2ed9ca43158ce361f79eff9c6b35f464
Fixes:
111194289
Test: robotests
Malcolm Chen [Tue, 26 Jun 2018 21:39:04 +0000 (14:39 -0700)]
Fix bug of phoneListener always listens to default subId in WFC.
In WiFi calling settings, although each WifiCallingSettingsForSub
instance has its mSubId, the mPhoneStateListener always listens to
state of default subId, which is incorrect. This is to fix that.
Bug:
109787945
Test: In DSDS device, open WFC settings. Make phone call using default
voice phone, and check that WFC setting tab of the other phone is
not greyed out.
Change-Id: I126047c6099bf156b40e0145aa55df0fdf8ef882
Fan Zhang [Thu, 12 Jul 2018 20:22:23 +0000 (13:22 -0700)]
Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.
(Also converted the CurrentDream controller to be slice compatible)
Change-Id: I28874f296da617f4cedf6706b0663b76671f1780
Fixes:
111375261
Test: robotests
TreeHugger Robot [Thu, 12 Jul 2018 20:04:33 +0000 (20:04 +0000)]
Merge "Fix a crash when setting lock pattern in SUW"
Fan Zhang [Thu, 12 Jul 2018 19:06:17 +0000 (12:06 -0700)]
Fix a crash when setting lock pattern in SUW
Change-Id: Ic2f1bc5946014d126f2d600966764e1f00be6559
Fixes:
111381755
Test: manual in SUW
Fan Zhang [Thu, 12 Jul 2018 17:58:13 +0000 (10:58 -0700)]
Remove NewDeviceIntroSuggestion
The functionality is entirely replaced by other apps.
Change-Id: Id3d425cf92a07bae070cd22c0d726aba0472dd5d
Fixes:
111195449
Test: robotest
Raff Tsai [Thu, 12 Jul 2018 09:32:46 +0000 (17:32 +0800)]
Modify icon color and fix search bar corner
- add android:colorAccent attribute in theme
- fix wrong xmlns
Change-Id: Ia8a0a715edf40959c952f8982298a830bedfa156
Fixes:
111359684
Test: manual
TreeHugger Robot [Thu, 12 Jul 2018 08:16:32 +0000 (08:16 +0000)]
Merge "Add new widget SingleTargetGearPreference"
tmfang [Thu, 28 Jun 2018 14:57:12 +0000 (22:57 +0800)]
Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.
Test: make RunSettingsRoboTests -j56
Bug:
110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
tmfang [Thu, 28 Jun 2018 03:39:05 +0000 (11:39 +0800)]
Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors.
Test: We can't test it now. But we will have an integration test later.
Bug:
110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
tmfang [Tue, 26 Jun 2018 11:01:57 +0000 (19:01 +0800)]
Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.
This patch can't compile pass and run test case.
We will update other patches to fix these problem.
Change list.
1. import android.app.Fragment; ->
import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
import androidx.loader.app.LoaderManager.LoaderCallbacks;
Bug:
110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
TreeHugger Robot [Thu, 12 Jul 2018 00:50:00 +0000 (00:50 +0000)]
Merge "Add some pages to search index."
Fan Zhang [Wed, 11 Jul 2018 16:41:39 +0000 (09:41 -0700)]
Add some pages to search index.
* Notification access page
* VR Listener page
* Feature flags in dev options
* QS Tile developer options
* User dictionary
* Billing cycle
* Some accessibilty pages
Bug:
70720645
Test: robotests
Change-Id: I4f7d3d65b2803cebf178ac345a79721232df707c
xiamin [Wed, 11 Jul 2018 23:13:36 +0000 (16:13 -0700)]
Merge "new password shouldn't be empty string" am:
dd7bd6b15a am:
bfb61ed2ed
am:
7ed2928876
Change-Id: I818afc8d73bc0f987ab549a29300cc07b1ef1b89
Lei Yu [Wed, 11 Jul 2018 22:23:36 +0000 (22:23 +0000)]
Merge "Add sanity check method for BatteryTip"
xiamin [Wed, 11 Jul 2018 22:16:20 +0000 (15:16 -0700)]
Merge "new password shouldn't be empty string" am:
dd7bd6b15a
am:
bfb61ed2ed
Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5
xiamin [Wed, 11 Jul 2018 21:51:09 +0000 (14:51 -0700)]
Merge "new password shouldn't be empty string"
am:
dd7bd6b15a
Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
TreeHugger Robot [Wed, 11 Jul 2018 21:21:13 +0000 (21:21 +0000)]
Merge "Clean up: remove preference_category_no_title."
Treehugger Robot [Wed, 11 Jul 2018 20:23:29 +0000 (20:23 +0000)]
Merge "new password shouldn't be empty string"
TreeHugger Robot [Wed, 11 Jul 2018 20:19:44 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Wed, 11 Jul 2018 18:44:51 +0000 (11:44 -0700)]
Clean up: remove preference_category_no_title.
We already have a custom category layout that does the same thing.
Test: visual
Change-Id: Ice6daea8b2d9a14e9b013cf4175ce00f5ab1cc8d
Bill Yi [Wed, 11 Jul 2018 17:55:29 +0000 (10:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
11ebb14241 -s ours
am:
78f73c3352 -s ours
Change-Id: I56573cf23cf9cfb1f849f207afdcb3c63f2445e5
Bill Yi [Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
11ebb14241 -s ours
Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
Bill Yi [Wed, 11 Jul 2018 04:10:39 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e05b06302b091c99cfac9babc6a7ef4abafed17
Auto-generated-cl: translation import
Kevin Chyn [Wed, 11 Jul 2018 03:27:02 +0000 (03:27 +0000)]
Merge "4/n: Add basic enrollment for Face"
TreeHugger Robot [Wed, 11 Jul 2018 01:46:15 +0000 (01:46 +0000)]
Merge "Add a few pages to search index."
Kevin Chyn [Wed, 11 Jul 2018 01:43:17 +0000 (01:43 +0000)]
Merge "Fixed various strings & limits"
Kevin Chyn [Fri, 29 Jun 2018 00:59:32 +0000 (17:59 -0700)]
4/n: Add basic enrollment for Face
Bug:
110589286
Test: fingerprint enrolling still works
Test: enrollment flow with and without a pin set up still works properly
Test: enrollment continues when configuration changes, stops otherwise
Change-Id: I39f76c7f1a16e9533cef573f87cf4b81cb20cb18