OSDN Git Service
Inseob Kim [Thu, 8 Nov 2018 03:44:47 +0000 (12:44 +0900)]
Schematize vold system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug:
117924132
Test: m -j
Change-Id: Id2a696c621015d46015d5de0e7aef987e9e01b54
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
Treehugger Robot [Tue, 13 Nov 2018 19:20:38 +0000 (19:20 +0000)]
Merge "Allow StubVolume to be browseable in Settings"
Neil Fuller [Tue, 13 Nov 2018 09:33:16 +0000 (09:33 +0000)]
Merge "Remove the feature flag and dead code for the old time zone picker"
Victor Chang [Thu, 29 Mar 2018 17:52:09 +0000 (18:52 +0100)]
Remove the feature flag and dead code for the old time zone picker
This commit backports commit
6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb
to aosp/master.
Bug:
72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit
6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb)
Youming Ye [Fri, 9 Nov 2018 01:00:35 +0000 (01:00 +0000)]
Merge "Fix issue that read-only apns can be edited"
Risan [Sun, 28 Oct 2018 23:59:06 +0000 (08:59 +0900)]
Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug:
110380403
Change-Id: I96fc82e731225776ac7070ef035687f83da94245
Clown SHEN [Wed, 7 Nov 2018 07:09:27 +0000 (07:09 +0000)]
Merge "Launch WfcActivation with subscription ID"
Yuming Mao [Wed, 15 Aug 2018 07:10:23 +0000 (15:10 +0800)]
Fix issue that read-only apns can be edited
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.
To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.
Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug:
117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
clownshen [Wed, 31 Oct 2018 05:28:09 +0000 (13:28 +0800)]
Launch WfcActivation with subscription ID
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.
Bug:
112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
Bill Yi [Wed, 24 Oct 2018 21:47:27 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
Fan Zhang [Wed, 24 Oct 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
Hao Zhao [Tue, 8 Aug 2017 07:21:49 +0000 (15:21 +0800)]
Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.
Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.
Bug:
74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
Bill Yi [Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
Hall Liu [Thu, 18 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon"
am:
558535f3f2
Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Start using CarrierConfig for 4G/LTE icon"
Stanley Tng [Wed, 17 Oct 2018 18:07:29 +0000 (11:07 -0700)]
resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Treehugger Robot [Wed, 17 Oct 2018 04:48:36 +0000 (04:48 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids"
Stanley Tng [Tue, 16 Oct 2018 00:30:02 +0000 (17:30 -0700)]
resolve merge conflicts of
019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug:
117074814
Bug:
116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Youming Ye [Mon, 15 Oct 2018 17:42:52 +0000 (10:42 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
am:
f29392303a
Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
Youming Ye [Mon, 15 Oct 2018 17:08:22 +0000 (17:08 +0000)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug:
116725094
Bug:
116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit
068c2547f6f877273b09bf3ace5b4a4b61c7647a)
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am:
61c5a296e6
Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:07:25 +0000 (14:07 -0700)]
Merge "Move content later button doesn't work on Migration Wizard"
am:
1308b56908
Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
Treehugger Robot [Fri, 12 Oct 2018 20:52:31 +0000 (20:52 +0000)]
Merge "Move content later button doesn't work on Migration Wizard"
Neil Fuller [Fri, 12 Oct 2018 10:31:10 +0000 (03:31 -0700)]
Merge "Remove explicit dependency on bouncycastle"
am:
ed21203ea3
Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450
Neil Fuller [Fri, 12 Oct 2018 10:18:22 +0000 (10:18 +0000)]
Merge "Remove explicit dependency on bouncycastle"
Neil Fuller [Tue, 2 Oct 2018 20:37:30 +0000 (21:37 +0100)]
Remove explicit dependency on bouncycastle
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".
Test: build
Bug:
113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
Bill Rassieur [Wed, 10 Oct 2018 17:25:59 +0000 (17:25 +0000)]
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Change-Id: Ib38d3cdccddfe001600aeccf593b59c0e79505e9
BUG:
117431430
Sreekanth Badida [Mon, 5 Feb 2018 16:18:40 +0000 (17:18 +0100)]
RadioInfo: Disable ims provisioning switches in USER-build
Disables provisioning switches for Ims-related features in the RadioInfo
dialog when using USER-build. This prevents the user from circumventing
ims provisioning checks.
Bug:
78372174
Test: Manual
Change-Id: If538d7ed56ca53ae6a8be31ddf374d9a15a8fdec
Niklas Lindgren [Fri, 21 Sep 2018 12:23:07 +0000 (14:23 +0200)]
Start using CarrierConfig for 4G/LTE icon
Icon will be updated on sim swap or in case
the default data SIM changes.
Test: Add configs in vendor xml and swap between sim cards.
Tested on both single sim and dual sim.
Bug:
113309356
Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5
Chienyuan [Thu, 4 Oct 2018 02:48:47 +0000 (19:48 -0700)]
Merge "Don't set value when developer options disabled"
am:
692f5368d0
Change-Id: Icddab4eb38cade9d111e39a0e2dfee24198aabc0
Treehugger Robot [Thu, 4 Oct 2018 02:28:42 +0000 (02:28 +0000)]
Merge "Don't set value when developer options disabled"
Chienyuan [Wed, 3 Oct 2018 13:04:19 +0000 (21:04 +0800)]
Don't set value when developer options disabled
We shouldn't change property when developer options disabled.
Change A2DP HW offload property without reboot, A2DP will not work.
Bug:
109717129
Test: manual
Change-Id: I96103b04922b28995be198badbed324de40624f0
Neil Fuller [Wed, 3 Oct 2018 07:26:56 +0000 (00:26 -0700)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
am:
a934366a8d
Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f
Neil Fuller [Wed, 3 Oct 2018 07:13:37 +0000 (07:13 +0000)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
Neil Fuller [Tue, 2 Oct 2018 13:16:23 +0000 (06:16 -0700)]
Merge "Use ICU APIs not impl types"
am:
811d817368
Change-Id: I38d6806255619fec3de23945a184455072f34ec0
Neil Fuller [Tue, 2 Oct 2018 12:59:47 +0000 (12:59 +0000)]
Merge "Use ICU APIs not impl types"
Neil Fuller [Tue, 2 Oct 2018 10:55:20 +0000 (11:55 +0100)]
Avoid deprecated PrivateKeyInfo.getAlgorithmId()
Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.
Bug:
113148576
Test: build only / inspection
Merged-In: Iab2d3b23ad969f683d716cb981e32fd554c67a81
Change-Id: I9ed5c96a20d6749bf75212c0fd820d71ca0a6053
Neil Fuller [Tue, 2 Oct 2018 09:15:36 +0000 (10:15 +0100)]
Use ICU APIs not impl types
It's possible to use BasicTimeZone in place of OlsonTimeZone.
Although neither are currently public SDK APIs the BasicTimeZone
is preferable.
Bug:
113148576
Test: build
Change-Id: I745b17feee678ecd053fadc6c447107fa80918e8
Takamasa Kuramitsu [Mon, 1 Oct 2018 13:34:06 +0000 (22:34 +0900)]
Move content later button doesn't work on Migration Wizard
"Move content later" button doesn't work on StorageWizardMigrateConfirm
screen which is shown when end-user try to migrate data from adopted
SD Card to internal storage.
The cause is "Move content later" button triggers to StorageWizardReady
screen but cannot launch because the mDisk is null when the destination
of migration is internal storage.
This CL fixes to just exit StorageWizardMigrateConfirm screen when mDisk
is null.
Bug:
117082495
Test: manual
Change-Id: Iccdccf4dda126d77458b9db35e4ec6ae6a263cb7
Leon Liao [Wed, 26 Sep 2018 12:59:20 +0000 (05:59 -0700)]
Merge "Rename isConnectable()"
am:
ec65174f11
Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
Leon Liao [Tue, 25 Sep 2018 23:06:20 +0000 (23:06 +0000)]
Merge "Rename isConnectable()"
Youming Ye [Tue, 25 Sep 2018 17:20:06 +0000 (10:20 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am:
b7e3552b83
Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
Youming Ye [Tue, 25 Sep 2018 17:04:10 +0000 (17:04 +0000)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
Torbjorn Eklund [Mon, 24 Sep 2018 17:48:00 +0000 (10:48 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config"
am:
f6f7079709
Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
Treehugger Robot [Mon, 24 Sep 2018 17:24:03 +0000 (17:24 +0000)]
Merge "ApnEditor: Consider subId when reading carrier config"
Lei Yu [Fri, 21 Sep 2018 20:13:39 +0000 (13:13 -0700)]
Merge "Fix incorrect API invoke for BT profiles"
am:
625c1eeaa9
Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
Lei Yu [Fri, 21 Sep 2018 19:50:45 +0000 (19:50 +0000)]
Merge "Fix incorrect API invoke for BT profiles"
jackqdyulei [Tue, 18 Sep 2018 22:07:49 +0000 (15:07 -0700)]
Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()
Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes:
113625278
Test: RunSettingsRoboTests
Torbjorn Eklund [Wed, 25 Jul 2018 20:14:30 +0000 (22:14 +0200)]
ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.
This ensures that the APN will be editable or non-editable correctly
when using dual sim.
Bug:
112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
Leon Liao [Tue, 18 Sep 2018 04:21:51 +0000 (12:21 +0800)]
Rename isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.
Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug:
79982487
Test: atest tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
Sandeep Gutta [Tue, 18 Sep 2018 06:51:27 +0000 (12:21 +0530)]
Fix error message shown when SIM PIN enable/disable fails
Current code fails to pass the 3GPP spec test case 27.14.3
'Disabling the PIN'.
An Incorrect toast error message is displayed, when enable/disable
SIM PIN operation fails without checking the error code.
Fix: Display appropriate toast error message based on the SIM PIN
enable/disable error code.
Bug:
73080305
Change-Id: I4219c68c7ebcf450a2f779b2d1f1ce881440753b
Fan Zhang [Thu, 13 Sep 2018 00:12:54 +0000 (17:12 -0700)]
Merge "Clean up: delete unused methods"
am:
41f9566da8
Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
Fan Zhang [Wed, 12 Sep 2018 23:46:31 +0000 (23:46 +0000)]
Merge "Clean up: delete unused methods"
Fan Zhang [Wed, 12 Sep 2018 23:13:08 +0000 (16:13 -0700)]
Merge "Changes on Settings UI for a better user experience"
am:
7737b64159
Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
Fan Zhang [Wed, 12 Sep 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Changes on Settings UI for a better user experience"
Fan Zhang [Wed, 12 Sep 2018 20:08:15 +0000 (13:08 -0700)]
Clean up: delete unused methods
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
Jin Dong [Fri, 24 Aug 2018 08:24:53 +0000 (16:24 +0800)]
Changes on Settings UI for a better user experience
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
- "Network settings reset"
- "Factory data reset"
- "Screen pinning"
Bug:
113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
Fan Zhang [Wed, 12 Sep 2018 01:28:08 +0000 (18:28 -0700)]
Merge "Fix a crash when launching app detail for bad package name"
am:
ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
Treehugger Robot [Wed, 12 Sep 2018 00:57:40 +0000 (00:57 +0000)]
Merge "Fix a crash when launching app detail for bad package name"
Fan Zhang [Tue, 11 Sep 2018 21:52:46 +0000 (14:52 -0700)]
Fix a crash when launching app detail for bad package name
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes:
78779901
Test: robotests
Fan Zhang [Tue, 11 Sep 2018 20:13:33 +0000 (13:13 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size."
am:
98a1ebedcd -s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
Fan Zhang [Tue, 11 Sep 2018 16:27:57 +0000 (16:27 +0000)]
Merge "Add config to disable app tray preview in display size."
Fan Zhang [Sat, 8 Sep 2018 00:06:07 +0000 (17:06 -0700)]
Add config to disable app tray preview in display size.
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes:
113374067
Test: robotests
Fan Zhang [Mon, 10 Sep 2018 16:27:07 +0000 (09:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up."
am:
8a2c9e79b0 -s ours
Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
Fan Zhang [Mon, 10 Sep 2018 15:58:34 +0000 (15:58 +0000)]
Merge "DO NOT MERGE Import clean up."
Fan Zhang [Tue, 4 Sep 2018 20:52:15 +0000 (13:52 -0700)]
DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.
Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
tiansiming [田思明] [Tue, 4 Sep 2018 19:55:11 +0000 (12:55 -0700)]
Merge "Update string for message of DirectBootWarnDialog"
am:
b0cc3a6c7d
Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
Treehugger Robot [Tue, 4 Sep 2018 19:46:18 +0000 (19:46 +0000)]
Merge "Update string for message of DirectBootWarnDialog"
tiansiming [田思明] [Thu, 18 Jan 2018 12:50:48 +0000 (20:50 +0800)]
Update string for message of DirectBootWarnDialog
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.
Bug: https://partnerissuetracker.corp.google.com/u/0/issues/
72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.
Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Youming Ye [Thu, 30 Aug 2018 22:28:44 +0000 (15:28 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
am:
903d2610dd
Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
Youming Ye [Thu, 30 Aug 2018 22:03:06 +0000 (22:03 +0000)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
Youming Ye [Thu, 30 Aug 2018 01:20:22 +0000 (18:20 -0700)]
Fix the Wifi Calling back button goes to wrong screen
The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.
Bug:
111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015
Aurimas Liutikas [Wed, 29 Aug 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx."
am:
a544f17b99 -s ours
Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
Treehugger Robot [Wed, 29 Aug 2018 18:31:08 +0000 (18:31 +0000)]
Merge "Migrate Settings to androidx."
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
(cherry picked from commit
b1af85d15523db44d4fa80c78409069ec691ed0a)
hjchangliao [Tue, 28 Aug 2018 22:07:13 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am:
6e2db2c34b -s ours
Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Colin Cross [Tue, 28 Aug 2018 21:42:48 +0000 (21:42 +0000)]
Merge "Migrate Settings to androidx." into stage-aosp-master
Fan Zhang [Tue, 28 Aug 2018 21:41:43 +0000 (14:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
am:
56cc4986df -s ours
Change-Id: Iff1f6e189feae17f1166990de31d6f64f920734e
Treehugger Robot [Tue, 28 Aug 2018 21:29:05 +0000 (21:29 +0000)]
Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates
- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings
The task affinity is messing with the back stack for this activity when
launched externally
Fixes:
80281932
Fixes:
80290571
Test: manual
Disable uninstall update option for secondary users.
Fixes:
110249550
Test: manual
Suppress some gesture search when there is no hardware
Fixes:
110250839
Test: robotests
Check wifi password length by byte, not char.
Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes:
79209073
Test: robotest
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
Fan Zhang [Tue, 28 Aug 2018 18:38:27 +0000 (11:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am:
fcaf926dc1 -s ours
Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
Treehugger Robot [Tue, 28 Aug 2018 18:03:31 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Fix color_lint errors"
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE Fix color_lint errors
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
Doris Ling [Sun, 26 Aug 2018 06:12:24 +0000 (23:12 -0700)]
Merge "Fix crash in clicking Default Home gear icon."
am:
0c724f5181
Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
Treehugger Robot [Fri, 24 Aug 2018 23:58:31 +0000 (23:58 +0000)]
Merge "Fix crash in clicking Default Home gear icon."
Doris Ling [Thu, 23 Aug 2018 20:25:06 +0000 (13:25 -0700)]
Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes:
112249115
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 23 Aug 2018 18:08:32 +0000 (11:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
am:
da38b41b9a -s ours
Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d
Treehugger Robot [Thu, 23 Aug 2018 17:38:38 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button."
Fan Zhang [Thu, 23 Aug 2018 16:25:18 +0000 (09:25 -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:
112986476
Bug:
111195268
Test: manual
Yuchen Dong [Thu, 23 Aug 2018 08:32:40 +0000 (17:32 +0900)]
Wrong Carrier Config values are used in ApnSettings for Multi SIM device
In ApnSettings, it always uses Carrier Config values of default subId.
So, wrong carrier config values are used for non-default subId.
To resolve this issue, read Carrier Config values based on subId.
Test: manual - Check Carrier Config values are read based on subId.
Bug:
111172301
Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341
Hemant Gupta [Fri, 17 Aug 2018 19:11:27 +0000 (12:11 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am:
84bb2293ae
Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"