OSDN Git Service
Kevin Chang [Mon, 1 Jul 2019 06:51:36 +0000 (14:51 +0800)]
Add footer preference into caption preferences
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.
Bug:
135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
tmfang [Sat, 29 Jun 2019 11:58:32 +0000 (04:58 -0700)]
Merge "Add summary for white balance feature" into qt-r1-dev am:
9cd8167bff
am:
ef24931fd8
Change-Id: I9b205093afd8e9280b529fdc64e6b6c70cc94a77
tmfang [Sat, 29 Jun 2019 11:41:31 +0000 (04:41 -0700)]
Merge "Add summary for white balance feature" into qt-r1-dev
am:
9cd8167bff
Change-Id: Ifbaf043712bc0bb46d1ce8e8338e6da34ddf06cb
TreeHugger Robot [Sat, 29 Jun 2019 10:57:45 +0000 (10:57 +0000)]
Merge "Add summary for white balance feature" into qt-r1-dev
Andrew Sapperstein [Fri, 28 Jun 2019 23:49:13 +0000 (16:49 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a am:
647f685063
am:
bd5934623e
Change-Id: If0b68cb2b4d1591641ff08d7af025ca55c36fd04
Yanting Yang [Fri, 28 Jun 2019 23:48:51 +0000 (16:48 -0700)]
Fix RTL issue of Deferred Setup card am:
f6972b29b1
am:
925f5929de
Change-Id: Ied868eb29bf2141fa3cd0cfa5cb33bae897d2d82
Winson Chung [Fri, 28 Jun 2019 23:48:38 +0000 (16:48 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963 am:
8d08713c96
am:
0839b6fdc7
Change-Id: I902b22a4c1945e55a0a62e3386647fc7fad33b57
Evan Severson [Fri, 28 Jun 2019 23:48:25 +0000 (16:48 -0700)]
[automerger skipped] Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev am:
f461d8dc52
am:
e7f084deb2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia8f0ec33d86e4c212dd8e1ebc6134395479a9a89
Joel Galenson [Fri, 28 Jun 2019 23:48:13 +0000 (16:48 -0700)]
[automerger skipped] Remove Permissions Hub. DO NOT MERGE am:
69d9899868
am:
9aa82c09fe -s ours
am skip reason: subject contains skip directive
Change-Id: I4b64ebf50d004a3c1a685bb72ecbddf5327db9b5
Amin Shaikh [Fri, 28 Jun 2019 23:47:58 +0000 (16:47 -0700)]
[automerger skipped] Update Settings overlayed icons. am:
c477507f4e
am:
3e484def2f -s ours
am skip reason: change_id Ib548c0b47db0064bcb1536c9b7a650912f28273f with SHA1
5d8b1b3cc5 is in history
Change-Id: Iffe2795c97b0a9a769eef2d8cf311e7dd87080eb
Andrew Sapperstein [Fri, 28 Jun 2019 21:55:07 +0000 (14:55 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a
am:
647f685063
Change-Id: I68de93372d8350b3538bcdf86ee811ce846d9a3a
Yanting Yang [Fri, 28 Jun 2019 21:54:39 +0000 (14:54 -0700)]
Fix RTL issue of Deferred Setup card
am:
f6972b29b1
Change-Id: Idf00d35429f6fed5250fdf6b8a4de962638ad976
Winson Chung [Fri, 28 Jun 2019 21:54:28 +0000 (14:54 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963
am:
8d08713c96
Change-Id: I6561e5313a24b076e947f2ed875097883684f001
Evan Severson [Fri, 28 Jun 2019 21:54:07 +0000 (14:54 -0700)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
am:
f461d8dc52
Change-Id: Id8374e6c7f1a3b7bce7e04d01ae1d0e8e61e6c1d
Joel Galenson [Fri, 28 Jun 2019 21:54:06 +0000 (14:54 -0700)]
Remove Permissions Hub. DO NOT MERGE
am:
69d9899868
Change-Id: I672b8c4f4184a0a2b96a0a7320103ef1754ff54e
Amin Shaikh [Fri, 28 Jun 2019 21:53:48 +0000 (14:53 -0700)]
Update Settings overlayed icons.
am:
c477507f4e
Change-Id: Ia3ac06b30d829a14891c0811a89869640ccd225c
Andrew Sapperstein [Fri, 28 Jun 2019 18:07:18 +0000 (11:07 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a am:
0c1f7da25a
am:
722f8c0ac1
Change-Id: Ib41961f01cfc6530a43e65e593a1248714f6143c
Andrew Sapperstein [Fri, 28 Jun 2019 17:47:58 +0000 (10:47 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a
am:
0c1f7da25a
Change-Id: I7e3ce8019cc4a411dec6ebf72b8518e1026ed73d
Andrew Sapperstein [Fri, 28 Jun 2019 17:32:22 +0000 (10:32 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am:
72aded338a
Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
Andrew Sapperstein [Fri, 28 Jun 2019 17:28:07 +0000 (10:28 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am:
72aded338a
Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev
Mill Chen [Wed, 26 Jun 2019 11:58:25 +0000 (19:58 +0800)]
Separate mono audio preference controller from accessibility
Bug:
135056871
Test: manual, robotests
Change-Id: I839c07a3a61ae97f33b339d307734504c45a6622
TreeHugger Robot [Fri, 28 Jun 2019 03:01:21 +0000 (03:01 +0000)]
Merge "Separate auto click preference controller from accessibility"
Yanting Yang [Thu, 27 Jun 2019 13:20:12 +0000 (21:20 +0800)]
Fix RTL issue of Deferred Setup card
Correct layout gravity to "start" to apply RTL layout.
Fixes:
131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
(cherry picked from commit
c200df360cc5dfb29a649ebbba7a632c77408e3d)
Winson Chung [Fri, 28 Jun 2019 00:10:57 +0000 (17:10 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963 am:
8bf207bab6
am:
27424848e8
Change-Id: Ifce634aa74f79829ba618b0d8b20c75e04a38532
Winson Chung [Thu, 27 Jun 2019 23:37:13 +0000 (16:37 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963
am:
8bf207bab6
Change-Id: I6461b114459160029df2caf8bfe86ad761cfd9be
Winson Chung [Thu, 27 Jun 2019 23:24:53 +0000 (16:24 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am:
9591c3f963
Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
Winson Chung [Thu, 27 Jun 2019 23:23:53 +0000 (16:23 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am:
9591c3f963
Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
Evan Severson [Thu, 27 Jun 2019 21:21:56 +0000 (21:21 +0000)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Thu, 27 Jun 2019 18:19:26 +0000 (18:19 +0000)]
Merge "Separate power button preference controller from accessibility"
TreeHugger Robot [Thu, 27 Jun 2019 16:32:42 +0000 (16:32 +0000)]
Merge "Fix RTL issue of Deferred Setup card"
Mill Chen [Tue, 25 Jun 2019 15:03:39 +0000 (23:03 +0800)]
Separate power button preference controller from accessibility
Bug:
135056871
Test: manual, robotest
Change-Id: Ia3c2134bd9f88a39a796e4201f7bdf8c3015baa1
TreeHugger Robot [Thu, 27 Jun 2019 14:50:56 +0000 (14:50 +0000)]
Merge "Separate text contrast preference controller from accessibility"
Amin Shaikh [Thu, 23 May 2019 15:23:46 +0000 (11:23 -0400)]
Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.
Bug:
131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Mill Chen [Tue, 25 Jun 2019 13:01:39 +0000 (21:01 +0800)]
Separate auto click preference controller from accessibility
Bug:
135056871
Test: manual, robotests
Change-Id: I5125fd79d0bc257ebf8108dd84d520d25a0ed669
TreeHugger Robot [Thu, 27 Jun 2019 14:12:28 +0000 (14:12 +0000)]
Merge "Update Settings overlayed icons."
TreeHugger Robot [Thu, 27 Jun 2019 14:11:59 +0000 (14:11 +0000)]
Merge "Separate large pointer preference controller from accessibility"
Yanting Yang [Thu, 27 Jun 2019 13:20:12 +0000 (21:20 +0800)]
Fix RTL issue of Deferred Setup card
Correct layout gravity to "start" to apply RTL layout.
Fixes:
131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
Mill Chen [Wed, 26 Jun 2019 14:24:29 +0000 (22:24 +0800)]
Separate text contrast preference controller from accessibility
Bug:
135056871
Test: manual, robotests
Change-Id: Ia28d8038f341a1a74385d168f78da8a10cca8fcd
Louis Chang [Thu, 27 Jun 2019 01:57:54 +0000 (09:57 +0800)]
Adding unique task affinity for FallbackHome activity
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug:
135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
Joel Galenson [Thu, 30 May 2019 15:30:49 +0000 (08:30 -0700)]
Remove Permissions Hub. DO NOT MERGE
Bug:
132292477
Test: View all related screens.
(cherry picked from commit
1e7c172ad5704754266bee50a9bc59b3205e8b70)
This should have been submitted with ag/
8109287
Bug:
136012133
Test: Clicked through permission screens on cuttlefish
Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
Joshua Imbriani [Wed, 26 Jun 2019 15:23:32 +0000 (15:23 +0000)]
Merge "Making changes to TTS pitch and rate also apply to work profiles"
Sunny Shao [Wed, 26 Jun 2019 11:53:03 +0000 (04:53 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694 am:
27067657f2
am:
1ae1523a91
Change-Id: Idb9b4c65846d3b37bb7920f49712d16a0668ceb0
Sunny Shao [Wed, 26 Jun 2019 11:51:29 +0000 (04:51 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694 am:
bfffb2ae74
am:
e4310ea096
Change-Id: I51ee1d27e136d2e5be4ecfa29892125debefe80c
Sunny Shao [Wed, 26 Jun 2019 11:44:02 +0000 (04:44 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694
am:
27067657f2
Change-Id: I86a40d4016d185fee5f45e2bb69cbf0814d9fbeb
Sunny Shao [Wed, 26 Jun 2019 11:43:25 +0000 (04:43 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694
am:
bfffb2ae74
Change-Id: I51cbaf932b7dac50a2fd246d47f3fb69cd421c27
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am:
5a69fac694
Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am:
5a69fac694
Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
tmfang [Wed, 26 Jun 2019 09:22:10 +0000 (17:22 +0800)]
Add summary for white balance feature
Create a string id for summary.
This string should be empty string for AOSP.
Test: visual
Bug:
134790233
Change-Id: I06b5d0b35ac08565d3496f8559f5bd85cd56c6b8
Mill Chen [Tue, 25 Jun 2019 15:21:49 +0000 (23:21 +0800)]
Separate large pointer preference controller from accessibility
Bug:
135056871
Test: manual, robotest
Change-Id: Id8e81f70d5121a97b6766b444298379f7ce062ea
TreeHugger Robot [Wed, 26 Jun 2019 08:42:03 +0000 (08:42 +0000)]
Merge "Separate disable animations preference controller from accessibility"
TreeHugger Robot [Wed, 26 Jun 2019 08:38:11 +0000 (08:38 +0000)]
Merge "Separate a11y timeout preference controller from accessibility"
Mill Chen [Fri, 21 Jun 2019 09:27:47 +0000 (17:27 +0800)]
Separate a11y timeout preference controller from accessibility
Bug:
135056871
Test: manual, robotest
Change-Id: I00d40451b40c0a4d5e214b23d78139195d98e42b
Mill Chen [Tue, 25 Jun 2019 15:48:04 +0000 (23:48 +0800)]
Separate disable animations preference controller from accessibility
Bug:
135056871
Test: manual, robotests
Change-Id: I14f322d91179779f2d758c58a2ed729efc0b45f5
Antony Sargent [Wed, 26 Jun 2019 06:20:29 +0000 (23:20 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2 am:
fb52368873
am:
dd3a072ce6
Change-Id: I7c2d2b76ac9cfb863d315401b7665885973a1038
Antony Sargent [Wed, 26 Jun 2019 06:19:13 +0000 (23:19 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2 am:
e4e1f08781
am:
85a2cd23f7
Change-Id: I9b1c25d6b2a0ad36aee5134db0d831f640f97bf8
Antony Sargent [Wed, 26 Jun 2019 06:11:46 +0000 (23:11 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2
am:
fb52368873
Change-Id: Ib5a9f6d77ce599c8f0892c78fdd49105e0fc7fdd
Antony Sargent [Wed, 26 Jun 2019 06:11:15 +0000 (23:11 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2
am:
e4e1f08781
Change-Id: I5142d6a71e16dca999c4370ab65a371d90563aed
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am:
3288037bd2
Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am:
3288037bd2
Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
Bill Yi [Wed, 26 Jun 2019 05:30:15 +0000 (22:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
9905cc9b50 -s ours
am:
9e8e6dffa0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic9cc8b30718cac28df42090d4ddff0010b5953a6
Bill Yi [Wed, 26 Jun 2019 05:22:11 +0000 (22:22 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
9905cc9b50 -s ours
am skip reason: subject contains skip directive
Change-Id: I62d2bdcc5dbdb6dcdc38184e063d9825a6b1c5cc
TreeHugger Robot [Wed, 26 Jun 2019 04:00:28 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Joshua Mccloskey [Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev am:
35252d1b9f
am:
ef3d1939c8
Change-Id: I3c3b28e6ac2e67a588f970d8eae706390f666bc1
Joshua Mccloskey [Wed, 26 Jun 2019 01:58:54 +0000 (18:58 -0700)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
am:
35252d1b9f
Change-Id: Ic36d9fd8f00b01fe4c35e005cd9192b9cfe900e9
Joshua Mccloskey [Wed, 26 Jun 2019 01:15:50 +0000 (01:15 +0000)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
Vishwath Mohan [Wed, 26 Jun 2019 00:20:35 +0000 (17:20 -0700)]
Change fingerprint reference to biometric for lockdown am:
947a93ea75
am:
f035e6212b
Change-Id: I66a03fb04f0d2b6c1f9eb91f4360f840f0c54407
Vishwath Mohan [Wed, 26 Jun 2019 00:04:09 +0000 (17:04 -0700)]
Change fingerprint reference to biometric for lockdown
am:
947a93ea75
Change-Id: I08cb46d1752fcc5c317378c8838b39906ef9e389
Andrew Sapperstein [Tue, 18 Jun 2019 16:44:18 +0000 (09:44 -0700)]
Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.
Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.
Fixes:
135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
Bill Yi [Tue, 25 Jun 2019 22:43:36 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
134640169
Change-Id: Ifd9077857dbae28a18cf494a4c318669ec2b1519
Bill Yi [Tue, 25 Jun 2019 21:28:05 +0000 (14:28 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
01d889815d -s ours
am:
f6fd739942 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie174a01aafefb1e84e422ea360ed61f05f5eac62
Antony Sargent [Tue, 25 Jun 2019 21:01:36 +0000 (14:01 -0700)]
Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.
The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.
What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.
The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.
As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.
Fixes:
135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
Vishwath Mohan [Tue, 25 Jun 2019 20:39:58 +0000 (13:39 -0700)]
Change fingerprint reference to biometric for lockdown
Changes the lockdown description to reference biometric unlocks more
generally, and not just fingerprint unlock.
Bug:
135282412
Test: The string for lockdown does not refer to fingerprint
Change-Id: I8f1cf43bc8d42288d96a272b3243a7863c8d4941
Bill Yi [Tue, 25 Jun 2019 20:36:27 +0000 (13:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
01d889815d -s ours
am skip reason: subject contains skip directive
Change-Id: I27937e9386711f9d177e23aff8ac382b0e26c794
TreeHugger Robot [Tue, 25 Jun 2019 19:24:19 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 25 Jun 2019 19:19:38 +0000 (12:19 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a am:
48c61f173d
am:
d7c09b1a65
Change-Id: I63c7402a440d21777a297982da73ee755a8459f4
Antony Sargent [Tue, 25 Jun 2019 19:14:40 +0000 (12:14 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a am:
bc50fb8aef
am:
6a8d5e03db
Change-Id: I136f4f87d941a0c97c5c2035ade95721ffc490e5
Antony Sargent [Tue, 25 Jun 2019 18:55:57 +0000 (11:55 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a
am:
48c61f173d
Change-Id: I785164c77bcd6377db2a50ebeaafca40a89454c7
Antony Sargent [Tue, 25 Jun 2019 18:52:57 +0000 (11:52 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a
am:
bc50fb8aef
Change-Id: I616fd98109f8bd80c48f7ba0641b9219a3b00a30
Antony Sargent [Tue, 25 Jun 2019 18:44:50 +0000 (11:44 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am:
87fadeeb4a
Change-Id: Ib32dca04f573f3d84f77215c5ab891cb873072af
Antony Sargent [Tue, 25 Jun 2019 18:40:48 +0000 (11:40 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am:
87fadeeb4a
Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
TreeHugger Robot [Tue, 25 Jun 2019 17:54:54 +0000 (17:54 +0000)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Bill Yi [Tue, 25 Jun 2019 17:33:04 +0000 (10:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
Bill Yi [Tue, 25 Jun 2019 16:42:00 +0000 (09:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours am:
a5830871e2 -s ours
am:
eb1a0a85b9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ife42f37f66f10581c4cf78cd8fb83b68f1c924bf
Bill Yi [Tue, 25 Jun 2019 16:39:47 +0000 (09:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours am:
dbe1a25abd -s ours
am:
d76daeedba -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2fbc017f4200a63ca7c38b6a60b434072d421f5
Bill Yi [Tue, 25 Jun 2019 16:21:47 +0000 (09:21 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours
am:
a5830871e2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifcccedff3162831dfa7c14f16de8fe9b3e1bb9c9
Bill Yi [Tue, 25 Jun 2019 16:14:42 +0000 (09:14 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours
am:
dbe1a25abd -s ours
am skip reason: subject contains skip directive
Change-Id: Iaac85b2aa472e3a45e9194a354b58a702d5b0b82
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
279050c8d6 -s ours
am skip reason: subject contains skip directive
Change-Id: I60113754c64466c9729ef69156de47efcf8f775c
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
279050c8d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a
Raff Tsai [Tue, 25 Jun 2019 15:32:15 +0000 (15:32 +0000)]
Merge "Fix cannot switch between multiple TTS engines"
TreeHugger Robot [Tue, 25 Jun 2019 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 11:39:32 +0000 (11:39 +0000)]
Merge "Use FooterPreference in xml explicitly"
Bill Yi [Tue, 25 Jun 2019 11:07:28 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
Mehdi Alizadeh [Tue, 25 Jun 2019 09:22:56 +0000 (02:22 -0700)]
Merge "Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am:
32d16291de am:
453222d6c6" into qt-r1-dev-plus-aosp
am:
57e695fe63
Change-Id: Ibc952410534f3b53094d6ea70b0d9b9c20b8f856
Mehdi Alizadeh [Tue, 25 Jun 2019 09:12:57 +0000 (02:12 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am:
32d16291de am:
5ea919fc4b
am:
02fcd11b40
Change-Id: I95dc2cae26812f27c6f1a32a75d410c97aa363a2
tmfang [Mon, 24 Jun 2019 10:33:26 +0000 (18:33 +0800)]
Use FooterPreference in xml explicitly
We don't rely on FooterPreferenceMixinCompat
to create footer preference in dashboard fragment.
Instead, declare a FooterPreference explicitly in
xml of screen.
Test: visual, robotest
Bug:
124129485
Change-Id: I4c5b60c3926583eb0d9f0d4cd6996bf169d6408c
Raff Tsai [Mon, 24 Jun 2019 04:57:49 +0000 (12:57 +0800)]
Fix cannot switch between multiple TTS engines
- We didn't reset reset radio button state when user click back
while dialog was popped. Change the UI, when user really accepts the
dialog content, then changes radio button state.
- Migrate TtsEnginePreferenceFragment to RadioButtonPickerFragment
Fixes:
135588938
Test: manual
Change-Id: Ia824e08d59c77a23e6590ff0f5b7d897a73a1ff8
OSDN Git Service
