Bill Yi
a311a7f16f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 134640169
Change-Id: Ifd9077857dbae28a18cf494a4c318669ec2b1519
2019-06-25 15:43:36 -07:00
Bill Yi
ce9197b1c0
[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
2019-06-25 14:28:05 -07:00
Antony Sargent
46d819272a
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
2019-06-25 14:16:53 -07:00
Vishwath Mohan
947a93ea75
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
2019-06-25 20:41:58 +00:00
Bill Yi
f6fd739942
[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
2019-06-25 13:36:27 -07:00
TreeHugger Robot
01d889815d
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-25 19:24:19 +00:00
Antony Sargent
8532344531
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
am: 48c61f173d
...
am: d7c09b1a65
Change-Id: I63c7402a440d21777a297982da73ee755a8459f4
2019-06-25 12:19:38 -07:00
Antony Sargent
2bb3578876
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
am: bc50fb8aef
...
am: 6a8d5e03db
Change-Id: I136f4f87d941a0c97c5c2035ade95721ffc490e5
2019-06-25 12:14:40 -07:00
Antony Sargent
d7c09b1a65
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: 48c61f173d
Change-Id: I785164c77bcd6377db2a50ebeaafca40a89454c7
2019-06-25 11:55:57 -07:00
Antony Sargent
6a8d5e03db
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: bc50fb8aef
Change-Id: I616fd98109f8bd80c48f7ba0641b9219a3b00a30
2019-06-25 11:52:57 -07:00
Antony Sargent
48c61f173d
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
...
am: 87fadeeb4a
Change-Id: Ib32dca04f573f3d84f77215c5ab891cb873072af
2019-06-25 11:44:50 -07:00
Antony Sargent
bc50fb8aef
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
...
am: 87fadeeb4a
Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
2019-06-25 11:40:48 -07:00
TreeHugger Robot
87fadeeb4a
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
2019-06-25 17:54:54 +00:00
Bill Yi
1f064f21bc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
2019-06-25 10:33:04 -07:00
Bill Yi
ab8af8fd8f
[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
2019-06-25 09:42:00 -07:00
Bill Yi
c404028b57
[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
2019-06-25 09:39:47 -07:00
Bill Yi
eb1a0a85b9
[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
2019-06-25 09:21:47 -07:00
Bill Yi
d76daeedba
[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
2019-06-25 09:14:42 -07:00
Bill Yi
a5830871e2
[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
2019-06-25 08:57:36 -07:00
Bill Yi
dbe1a25abd
[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
2019-06-25 08:57:36 -07:00
Raff Tsai
50fca4ccdb
Merge "Fix cannot switch between multiple TTS engines"
2019-06-25 15:32:15 +00:00
TreeHugger Robot
279050c8d6
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-25 14:46:00 +00:00
TreeHugger Robot
28b1277992
Merge "Use FooterPreference in xml explicitly"
2019-06-25 11:39:32 +00:00
Bill Yi
fe1b808001
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
2019-06-25 04:07:28 -07:00
Mehdi Alizadeh
02d06dd79c
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
2019-06-25 02:22:56 -07:00
Mehdi Alizadeh
cee5585b00
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
am: 5ea919fc4b
...
am: 02fcd11b40
Change-Id: I95dc2cae26812f27c6f1a32a75d410c97aa363a2
2019-06-25 02:12:57 -07:00
tmfang
ec83f48e0d
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
2019-06-25 16:48:51 +08:00
Raff Tsai
a9fc062fd1
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
2019-06-25 16:46:31 +08:00
Kevin Chang
5f5ac0b32f
Merge "UI change in caption preferences in Settings"
2019-06-25 01:08:32 +00:00
Android Build Merger (Role)
57e695fe63
Merge "Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
am: 453222d6c6" into qt-r1-dev-plus-aosp
2019-06-25 01:06:07 +00:00
Mehdi Alizadeh
02fcd11b40
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
...
am: 5ea919fc4b
Change-Id: I83ea4996b6733087db15b8d5bf2662aa5d486fa0
2019-06-24 18:03:44 -07:00
Mehdi Alizadeh
ac5b6a3fde
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
...
am: 453222d6c6
Change-Id: Icda52879cb8f9478c3b68108b3699b13b0dfd80c
2019-06-24 18:03:10 -07:00
joshmccloskey
6634c159fd
Adding slice for Face Enrollment
...
Fixes: 134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
2019-06-24 17:41:36 -07:00
Mehdi Alizadeh
453222d6c6
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
...
am: 32d16291de
Change-Id: I1e37f368a64f2a0abeab0e0141e20b6ae98b5b9d
2019-06-24 17:39:26 -07:00
Mehdi Alizadeh
5ea919fc4b
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
...
am: 32d16291de
Change-Id: I96cbfd9d4e7b3b96f6977958861ae913dfa5e8ec
2019-06-24 17:36:26 -07:00
Mehdi Alizadeh
32d16291de
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
2019-06-25 00:09:06 +00:00
Hai Zhang
0f5448540d
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
am: 636920da48
...
am: 3df0b5072c
Change-Id: I381dec6d64ebabcf97aa26ce2c4243ac71c95b75
2019-06-24 14:39:04 -07:00
Hai Zhang
089d734f35
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
am: 5f8c446f47
...
am: 3603e24840
Change-Id: I60a1cfb995b5511a9aeea19c851beec778472702
2019-06-24 14:37:31 -07:00
Hai Zhang
3df0b5072c
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 636920da48
Change-Id: I8b5b41f3bd0c22d40c6670701fb4930bea7dd131
2019-06-24 14:33:48 -07:00
Hai Zhang
3603e24840
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 5f8c446f47
Change-Id: I4697c719c9274bd9a0ba5d4c8edf9e9a77454b7b
2019-06-24 14:32:28 -07:00
Hai Zhang
636920da48
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
...
am: b39810f5ab
Change-Id: Ia72e4fb5d1a7c930657ca26f15c58cd39220fe5e
2019-06-24 14:28:54 -07:00
Hai Zhang
5f8c446f47
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
...
am: b39810f5ab
Change-Id: I8ab0452cd656d25afe164dec49553512decfdcec
2019-06-24 14:28:54 -07:00
TreeHugger Robot
b39810f5ab
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
2019-06-24 21:19:17 +00:00
Hai Zhang
71f2614736
Revert "Add special apps access settings page for financial app."
...
This reverts commit 43374eabb8
.
Reason for revert: No longer needed because we are using whitelist for
SMS permission
Fixes: 135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2
2019-06-24 21:11:36 +00:00
Mehdi Alizadeh
0c7fd9e406
Adds metrics categories for gesture navigation dialogs
...
Bug: 135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6
2019-06-24 20:29:41 +00:00
Fabian Kozynski
ef959a4cbd
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
am: 6993ee0333
...
am: a2a88437b3
Change-Id: I07cceac9c055c75c448c32a4de71ad915798c22a
2019-06-24 13:28:28 -07:00
Fabian Kozynski
a2a88437b3
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
...
am: 6993ee0333
Change-Id: I17975ae334d49e6ab5c3555934e85b4337f505d8
2019-06-24 13:11:45 -07:00
Fabian Kozynski
6364288163
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
am: 5813622457
...
am: af88abb685
Change-Id: I925217030bdea6260993cc365b043fbb45e47340
2019-06-24 13:09:38 -07:00
Fabian Kozynski
6993ee0333
Merge "Fix Dark theme case" into qt-dev
...
am: 5bfb9f3240
Change-Id: I1c6a4a3c9c0c8e4daab6b33152e8bd2b3631072a
2019-06-24 13:01:23 -07:00
Fabian Kozynski
af88abb685
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
...
am: 5813622457
Change-Id: I6f868ef78b020ff6e3ffe425f0b5bd994409e18a
2019-06-24 12:58:46 -07:00