Bill Yi
2e96f10386
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 01d889815d
2019-06-25 13:54:17 -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
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
732fb3c9d0
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: 48c61f173d
2019-06-25 12:02:56 -07:00
Antony Sargent
d7c09b1a65
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: 48c61f173d
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
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
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
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
eb1a0a85b9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6 -s ours
...
am: a5830871e2
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
2019-06-25 09:14:42 -07:00
Bill Yi
42e3d21967
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6 -s ours
...
am: a5830871e2
2019-06-25 09:12:11 -07:00
Bill Yi
a5830871e2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
2019-06-25 08:57:36 -07:00
Bill Yi
dbe1a25abd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
2019-06-25 08:57:36 -07:00
TreeHugger Robot
279050c8d6
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-25 14:46:00 +00:00
android-build-team Robot
cfd5c3010a
Snap for 5686022 from 453222d6c6 to qt-c2f2-release
...
Change-Id: I95211e5cdd1710163daf831a0d6cccce56ba6574
2019-06-25 12:53:25 +00:00
android-build-team Robot
16e68e1bf7
Snap for 5685999 from 32d16291de to qt-release
...
Change-Id: I64f90b9c7fbb0a215d0210f4bcf293516591917c
2019-06-25 12:42:29 +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
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
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
2019-06-24 18:03:10 -07:00
Mehdi Alizadeh
db97b3c755
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
...
am: 453222d6c6
2019-06-24 18:01:46 -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
2019-06-24 17:39:26 -07:00
Mehdi Alizadeh
5ea919fc4b
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
...
am: 32d16291de
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
3df0b5072c
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 636920da48
2019-06-24 14:33:48 -07:00
Hai Zhang
613188ca09
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 636920da48
2019-06-24 14:33:18 -07:00
Hai Zhang
3603e24840
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 5f8c446f47
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
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
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
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
a2a88437b3
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
...
am: 6993ee0333
2019-06-24 13:11:45 -07:00
Fabian Kozynski
e069a84657
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
...
am: 6993ee0333
2019-06-24 13:11:42 -07:00
Fabian Kozynski
6993ee0333
Merge "Fix Dark theme case" into qt-dev
...
am: 5bfb9f3240
2019-06-24 13:01:23 -07:00
Fabian Kozynski
af88abb685
Merge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
...
am: 5813622457
2019-06-24 12:58:46 -07:00
Fabian Kozynski
5813622457
Merge "Fix Dark theme case" into qt-dev
...
am: 5bfb9f3240
2019-06-24 12:49:38 -07:00
Fabian Kozynski
5bfb9f3240
Merge "Fix Dark theme case" into qt-dev
2019-06-24 19:03:16 +00:00
Antony Sargent
45f0701380
Add a listener for subscription changes to SimDialogFragment
...
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.
But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.
Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
(cherry picked from commit 6a1d7e60ac
2019-06-24 16:58:40 +00:00
Fabian Kozynski
918bfa07ce
Fix Dark theme case
...
Test: manual
Fixes: 135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f
2019-06-24 10:07:17 -04:00
android-build-team Robot
a3118e6caa
Snap for 5681502 from e342579993 to qt-c2f2-release
...
Change-Id: I6d8f5225cb8211ae5883f7bf2b9ce17b69dc9051
2019-06-22 23:25:06 +00:00
android-build-team Robot
26fd8a6a3b
Snap for 5681426 from ab63fd3c25 to qt-release
...
Change-Id: I88f1916c31f749519688d7c94fee47a9d12c7df8
2019-06-22 23:17:03 +00:00
Yi Jiang
e8cedc7a80
Merge "Refresh camera permission status when it changed." into qt-r1-dev
...
am: e342579993
2019-06-21 17:22:19 -07:00
Yi Jiang
904d1f86d1
Merge "Refresh camera permission status when it changed." into qt-r1-dev
...
am: e342579993
2019-06-21 17:20:06 -07:00
Yi Jiang
e342579993
Merge "Refresh camera permission status when it changed." into qt-r1-dev
2019-06-21 23:59:21 +00:00
Yi Jiang
d66878f8fe
Refresh camera permission status when it changed.
...
Bug: 135497543
Test: Manually tested
Change-Id: I833e1658bc7888557635b764599c7a0baa226612
2019-06-21 15:07:50 -07:00
