OSDN Git Service
Hansong Zhang [Tue, 2 Oct 2018 16:28:11 +0000 (09:28 -0700)]
Fix build
Test: compile
Change-Id: I3d236ea1b1f5ee5b4b5b2aa118416383b5b4bb6d
Neil Fuller [Tue, 2 Oct 2018 13:24:33 +0000 (06:24 -0700)]
Merge "Use ICU APIs not impl types" am:
811d817368
am:
09dcb87982
Change-Id: Ic2f3ab527774f4d2d4464e8d879cdd4408afcb44
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"
Stanley Tng [Tue, 2 Oct 2018 10:54:35 +0000 (03:54 -0700)]
Merge changes from topic "hearing-aid" into pi-dev
am:
f9658e13bb
Change-Id: Ibdf40cc0a1712292fd41c1e38bbf879cfe3c4a65
timhypeng [Tue, 2 Oct 2018 10:53:36 +0000 (03:53 -0700)]
To show hearing aids device in the available devices group
am:
79d7fdc4f3
Change-Id: Ie4e4014c98701d69e20f0f9244e57b5293e07f15
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
TreeHugger Robot [Tue, 2 Oct 2018 00:53:40 +0000 (00:53 +0000)]
Merge changes from topic "hearing-aid" into pi-dev
* changes:
Add Feature Flag for Hearing Aid Profile
To show hearing aids device in the available devices group
Bill Yi [Sat, 29 Sep 2018 23:23:42 +0000 (16:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0b7858e7d9 -s ours
Change-Id: Ia903bff0e22b013664c0086dc11fdd5e3d8d8b50
Bill Yi [Sat, 29 Sep 2018 21:09:31 +0000 (14:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
Jordan Liu [Fri, 28 Sep 2018 19:17:49 +0000 (12:17 -0700)]
Merge "Refresh subscription info when subid changes" into pi-dev
am:
c07bb01f75
Change-Id: I955728bbde5ea462ebce0dc2099ccfd965862727
TreeHugger Robot [Fri, 28 Sep 2018 19:00:35 +0000 (19:00 +0000)]
Merge "Refresh subscription info when subid changes" into pi-dev
Fan Zhang [Wed, 26 Sep 2018 22:23:11 +0000 (15:23 -0700)]
Clean up task affinity.
am:
ff3652e0a3
Change-Id: I6727cae2ce9330860ad40104b20e00e8ecf58556
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)
timhypeng [Fri, 25 May 2018 06:01:02 +0000 (14:01 +0800)]
To show hearing aids device in the available devices group
Bug:
116725094
Bug:
116044083
Bug:
79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
Merged-In: I8fe5eb653d332ef5ac4a566146f150774581167c
(cherry picked from commit
1c21bff1034b5124b69bda22c2fc9f70a449ffa7)
Fan Zhang [Fri, 27 Jul 2018 23:16:43 +0000 (16:16 -0700)]
Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.
Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug:
112254258
Fixes:
111864355
Test: manual
Leon Liao [Wed, 26 Sep 2018 13:14:55 +0000 (06:14 -0700)]
Merge "Rename isConnectable()" am:
ec65174f11
am:
09385137e3
Change-Id: Iffe650dd574633cacc6197c6f6f69316b528fb0a
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:27:22 +0000 (10:27 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am:
b7e3552b83
am:
31576aae7c
Change-Id: Ib37954bccacb44b670ee6c1af6e7188fdd91a46a
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:57:37 +0000 (10:57 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config" am:
f6f7079709
am:
db353e2c4a
Change-Id: Ie2ad2655b5fc399610acdcfd8327e99c60b7e2a8
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"
Bill Yi [Sat, 22 Sep 2018 23:02:30 +0000 (16:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
5a4269d21e -s ours
Change-Id: I311f91cf73c826e657061f3fdbafd6e6c9ac5fa9
Bill Yi [Sat, 22 Sep 2018 18:38:37 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
Lei Yu [Fri, 21 Sep 2018 20:20:16 +0000 (13:20 -0700)]
Merge "Fix incorrect API invoke for BT profiles" am:
625c1eeaa9
am:
dbc26b576c
Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
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
Bill Yi [Mon, 17 Sep 2018 21:51:52 +0000 (14:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1a84e070b3 -s ours
Change-Id: I7b757cb1cc4622b05a2b1b2e277f680eb7e19898
Bill Yi [Mon, 17 Sep 2018 19:35:35 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0c4b9cded799380c969e2acf1aac3c5a785dc81f
Fan Zhang [Thu, 13 Sep 2018 00:39:21 +0000 (17:39 -0700)]
Merge "Clean up: delete unused methods" am:
41f9566da8
am:
b371dea0cb
Change-Id: I0545f7f9914337d64d8d91eb152005e4858b6869
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:25:12 +0000 (16:25 -0700)]
Merge "Changes on Settings UI for a better user experience" am:
7737b64159
am:
97cb71e978
Change-Id: I2862387d1cc18fb8536ed1a1e1c9441b64395977
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"
Bill Yi [Wed, 12 Sep 2018 22:30:03 +0000 (15:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
85c82c5681 -s ours
Change-Id: I0e777523597d91407f23f1f5c1ae8f84dd27c051
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
Bill Yi [Wed, 12 Sep 2018 19:07:42 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
Fan Zhang [Wed, 12 Sep 2018 01:49:12 +0000 (18:49 -0700)]
Merge "Fix a crash when launching app detail for bad package name" am:
ada1a39ffb
am:
2e2e1e243d
Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7
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"
Jordan Liu [Tue, 14 Aug 2018 23:52:07 +0000 (16:52 -0700)]
Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().
Fixes:
111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
Merged-In: I29492ef016c8ca9836ecf28c787e441629cfecb0
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:27:34 +0000 (13:27 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size." am:
98a1ebedcd -s ours
am:
4e8e6c3e67
Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8
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:31:09 +0000 (09:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up." am:
8a2c9e79b0 -s ours
am:
86e0ae5b6a -s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
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."
Bill Yi [Sun, 9 Sep 2018 04:21:36 +0000 (21:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
22360f9706 -s ours
Change-Id: I1c19e330d2c1a3d68db3ae76c501cc33f4f001ba
Bill Yi [Sun, 9 Sep 2018 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
jackqdyulei [Fri, 7 Sep 2018 17:56:57 +0000 (10:56 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61 am:
c05958ecdd -s ours
am:
6ec0b21544 -s ours
Change-Id: I14f1f1709d94784fdb0912f1c95b625d6318b4a0
jackqdyulei [Fri, 7 Sep 2018 17:51:10 +0000 (10:51 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61
am:
c05958ecdd -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
jackqdyulei [Fri, 7 Sep 2018 17:46:08 +0000 (10:46 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e
am:
618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
jackqdyulei [Fri, 7 Sep 2018 17:42:16 +0000 (10:42 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
am:
ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
Dan Willemsen [Fri, 7 Sep 2018 04:13:28 +0000 (21:13 -0700)]
Fix imports on pi-dev-plus-aosp to fix build
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Fan Zhang [Fri, 7 Sep 2018 01:33:30 +0000 (18:33 -0700)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am:
f81ec88024
Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
TreeHugger Robot [Fri, 7 Sep 2018 01:05:45 +0000 (01:05 +0000)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
jackqdyulei [Thu, 6 Sep 2018 20:14:18 +0000 (13:14 -0700)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
am:
205479c25d
Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
TreeHugger Robot [Thu, 6 Sep 2018 20:00:37 +0000 (20:00 +0000)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
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 20:05:10 +0000 (13:05 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d
am:
662e59e628
Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
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>
Bill Yi [Fri, 31 Aug 2018 15:56:23 +0000 (08:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
94fdfc4a44 -s ours
Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53
Bill Yi [Fri, 31 Aug 2018 02:02:59 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
Youming Ye [Thu, 30 Aug 2018 22:47:05 +0000 (15:47 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd
am:
7c4b70c6e5
Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
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:14:32 +0000 (12:14 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours
am:
2b0960c2d1 -s ours
Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a
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:15:25 +0000 (15:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours
am:
e89bf878c6 -s ours
Change-Id: I7e8d43ab2a4c1e735a4e855ce93212b20aa0e858
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
Colin Cross [Tue, 28 Aug 2018 22:03:29 +0000 (15:03 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
am:
048f11d0a9 -s ours
Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70
Aurimas Liutikas [Tue, 28 Aug 2018 21:59:45 +0000 (14:59 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
b1af85d155 -s ours
Change-Id: I098cc300a217762bcb77bc1b0b5f6ee6bdbc56dd
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours
am:
0e05005d8d -s ours
Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b
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
Fan Zhang [Tue, 28 Aug 2018 19:14:58 +0000 (12:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours
am:
6e65a32468 -s ours
Change-Id: Iaf37f20f3ff607c46a66eb278dc17d6998f87984
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"
OSDN Git Service
