Julia Reynolds
e5fc3bb57c
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
am: 4b78d753b8
...
Change-Id: I7c8da87f67f1306425677b6de82498cab2f3b45f
2020-05-22 12:04:02 +00:00
Julia Reynolds
423fdfa8bb
Update conversation-related strings am: 9e78ec75d1
am: 61e956443d
...
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
2020-05-22 12:03:49 +00:00
Julia Reynolds
4fbaf23958
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I3c7138e8e806aeed78da7a1c0807790af8b519f0
2020-05-22 11:48:42 +00:00
Julia Reynolds
f7eade72c6
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I11b6a55cffee069a1aef0df8d2ca9be0ca141161
2020-05-22 11:48:36 +00:00
Julia Reynolds
4b78d753b8
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I2a163df1ff0574518804bcff3be2f9650357f73a
2020-05-22 11:48:34 +00:00
Julia Reynolds
61e956443d
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
2020-05-22 11:48:26 +00:00
Julia Reynolds
edca211a67
Merge "clean up layout & styling of notification history" into rvc-dev
2020-05-22 11:23:59 +00:00
Julia Reynolds
9e78ec75d1
Update conversation-related strings
...
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Grace Jia
f203a66a74
Close and disable SIM lock dialogs when SIM removed from device.
...
Bug: 157102550
Test: Manually open the PIN toggle dialog and PIN edit dialog, then
remove SIM from DUT
Change-Id: Ied875909e9cbcb1cad1ae045578747a0a5810491
2020-05-21 13:47:09 -07:00
Bill Yi
0cc77c1db8
Import translations. DO NOT MERGE
...
BUG:154363304
Auto-generated-cl: translation import
Change-Id: I5e504e86b52fa341e03a497003190ca2e250bb01
2020-05-21 20:26:49 +00:00
Automerger Merge Worker
beecea6aec
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020
...
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55
2020-05-21 19:55:49 +00:00
Automerger Merge Worker
e33d4e6512
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
am: 06554d19ae" into rvc-qpr-dev-plus-aosp
2020-05-21 19:55:19 +00:00
Julia Reynolds
84fcccfe1f
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
am: 06554d19ae
...
Change-Id: Idee4f92953e81e9882ba06ee12c3097273390431
2020-05-21 19:54:53 +00:00
Julia Reynolds
25d1b428bf
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
am: a98f5e1445
...
Change-Id: I96e1f7e0a925443f9ad4429f1d4482c0da58198f
2020-05-21 19:54:38 +00:00
Automerger Merge Worker
74ddcbe020
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 0dc740b13d" into rvc-d1-dev-plus-aosp
2020-05-21 19:34:45 +00:00
Julia Reynolds
34e0ebd5dc
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 0dc740b13d
...
Change-Id: I75d636b27d67ce8a549d4d8287755c60c110677e
2020-05-21 19:34:39 +00:00
Julia Reynolds
a98f5e1445
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
...
Change-Id: Iabb72c8e018cf568ae43ac1a24f7d1b7fafbfad7
2020-05-21 19:34:33 +00:00
Julia Reynolds
06554d19ae
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
...
Change-Id: I86b8f73b5df03d2e57cb45dc848fbe43301ee8c6
2020-05-21 19:34:26 +00:00
Julia Reynolds
0dc740b13d
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
...
Change-Id: Ic642152c044aed6a4778ae38b449eabae4f77eb5
2020-05-21 19:17:25 +00:00
Julia Reynolds
22ac6baf3d
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
...
Change-Id: I84fb7adb02d4b7731327e531cddd48171bd4329b
2020-05-21 19:16:53 +00:00
Julia Reynolds
2679bf5af0
clean up layout & styling of notification history
...
Test: manual
Fixes: 157161601
Fixes: 157162238
Fixes: 157160265
Fixes: 157161125
Fixes: 157160611
Fixes: 157158944
Change-Id: I9853426987549898b7996e9db43f7767e4c41641
2020-05-21 14:55:51 -04:00
Julia Reynolds
6d63120295
Merge "Switch from shortlabel to label" into rvc-dev
2020-05-21 18:53:24 +00:00
Bill Yi
cd9694bd2f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3f42416bc415f259eaaaf87aeb8d273523e47989
2020-05-21 11:53:23 -07:00
Eran Messeri
4f2090ddc0
Fix disappearing biometric prompt for the managed profile
...
In several circumstances, the ConfirmDeviceCredentialActivity
may be started while the device is being unlocked - particularly, when
the managed profile on the device has a separate challenge and the user
is attempting to start an activity associated with the locked, managed
profile. For example, by double-tapping a notification from the managed
profile or trying to reply to such a notification.
When the ConfirmDeviceCredentialActivity is started after the user has
entered the primary lockscreen challenge but before the keyguard is
fully dismissed, the activity may be started and immediately paused.
If the activity then calls finish() in onPause(), the biometric prompt
will disappear and the user will not have a chance to authenticate.
Fix the issue by only calling finish() in onPause() if the biometric
prompt has not been shown.
The flag indicating whether the activity is waiting for biometric
prompt or not needs to be cleared whenever the biometric prompt invokes
the callback, so that the activity will correctly call finish() if the
user does abort authentication.
Bug: 153689182
Bug: 141470517
Test: Manual, set up a work profile and double-tap a work notification
or try to Reply to a work GMail notification.
Change-Id: I9d3d3000b99d0eb4b44b90f5a0c2856db5f32144
2020-05-21 18:42:41 +01:00
Robert Luo
b88826ad1b
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: fa85b4e1f6
am: c47bdeb62f
...
Change-Id: Id77ae49659ba09a5bf9d2a493b3b0d2e25875e8e
2020-05-21 15:59:42 +00:00
Robert Luo
1a7f615f53
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: 83fa4e6425
am: 09751770db
...
Change-Id: I074b93b3a1998ce89e89132ca7d15993402f2c4a
2020-05-21 15:58:31 +00:00
Robert Luo
d6fd16d704
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: 83fa4e6425
am: b15149a1eb
...
Change-Id: I0e875b6117d1c3a6afde37f6e9c6c8aa696bc053
2020-05-21 15:58:22 +00:00
Robert Luo
c47bdeb62f
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: fa85b4e1f6
...
Change-Id: I28cf36ad0dc3c278af23cca880075bf7ffc79e07
2020-05-21 15:33:16 +00:00
Robert Luo
b15149a1eb
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: 83fa4e6425
...
Change-Id: I5557b6c9dc3eeb82497f16ea1fdf912e26cfaa86
2020-05-21 15:33:03 +00:00
Robert Luo
09751770db
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
am: 83fa4e6425
...
Change-Id: I6ebc46eb67ea2e97d1c51774a7bc4f68d828032b
2020-05-21 15:32:56 +00:00
Robert Luo
fa85b4e1f6
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
...
Change-Id: I0e65ecc63313558f55c4ed1d0b6a4e263913610b
2020-05-21 15:08:49 +00:00
Robert Luo
83fa4e6425
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
...
Change-Id: I9c81a2973ffcb3416390417c48a72e3635bec0c4
2020-05-21 15:08:31 +00:00
Robert Luo
31f96bbcf6
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev
2020-05-21 14:56:54 +00:00
Automerger Merge Worker
22bcdc79cd
Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: e65b99bce2
am: b29c7c49e7" into rvc-qpr-dev-plus-aosp
2020-05-21 12:46:42 +00:00
TreeHugger Robot
640f3cec66
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: e65b99bce2
am: b29c7c49e7
...
Change-Id: I31e51425df7c1156b1a5266d665f0d60ce82e5c2
2020-05-21 12:46:37 +00:00
TreeHugger Robot
9316cd31e7
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: 1560e89128
am: 9a9490e6b9
...
Change-Id: I97499ad374d60634f6d71f6bb76c76307718da4c
2020-05-21 12:46:31 +00:00
TreeHugger Robot
37f19e547d
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: 1560e89128
am: 9e5d3a8805
...
Change-Id: I86a4c1678b1566135d0c1d3e8ef519598bc4e100
2020-05-21 12:46:10 +00:00
TreeHugger Robot
b29c7c49e7
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: e65b99bce2
...
Change-Id: I4ad18d5526b18a4eb862f77f379736fbd0e8a0e2
2020-05-21 12:35:02 +00:00
TreeHugger Robot
9a9490e6b9
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: 1560e89128
...
Change-Id: Idae86bae7cf14e65d72a3e9ef4073bdbee1557df
2020-05-21 12:34:59 +00:00
TreeHugger Robot
9e5d3a8805
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
am: 1560e89128
...
Change-Id: I05397c331eadd9841fd8c2ba935b75ad5861dbc8
2020-05-21 12:34:32 +00:00
TreeHugger Robot
e65b99bce2
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
...
Change-Id: I9a5a8969ec1998d0988ce1acc0ed68e3ec24d8a8
2020-05-21 12:21:01 +00:00
TreeHugger Robot
1560e89128
Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5
...
Change-Id: I97bc8f4fa39ca1fef9bbce21d1fb48832d948fba
2020-05-21 12:20:57 +00:00
TreeHugger Robot
43d6bd38f5
Merge "Only show work profile notifs if enabled" into rvc-dev
2020-05-21 12:09:37 +00:00
Yanting Yang
6b457d882c
Improve scrolling performance for App Info page
...
Root cause:
App info page will load application icon and content description in
onBindViewHolder(), it will query PackageManager and UserManager many
times in scrolling. Actually these actions will become time consuming if
there is a large app list.
Solution:
To relieve the janky scrolling, cache the icon and content description
if it has been loaded once.
Bug: 156527207
Test: manual test and robotests
Change-Id: I997179834511f86b3155c7d54989a873ac8e2559
2020-05-21 19:09:39 +08:00
Robert Luo
b7d1aa8efa
Add data collection and metrics for Media Output Switcher - 2/n
...
Fixes: 147792668
Test: ./out/host/linux-x86/bin/statsd_testdrive Atom_ID
Change-Id: I1a34228da75c197663bcfe909c961e57665590d4
2020-05-21 18:00:50 +08:00
Stanley Wang
732514cd5f
Fix the search result "Google Account" doesn't work.
...
- The "Google Account" item will launch the
AccountDetailDashboardFragment.
To launch the account detail page, we need the intent extras, account,
account label and account type.
- Currently, SI doesn't support to index the intent extras, so we launch
AccountDashboardFragment instead of AccountDetailDashboardFragment.
Fixes: 153626405
Test: manual test the search result and run Settings robotest
Change-Id: I081bd447c3f8422fb8859146b1ed4d7fcbc06810
2020-05-21 12:39:46 +08:00
paulhu
2efe482d95
Forward the ResultReceiver to Tethering Entitlement app
...
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-21 02:33:15 +00:00
Quang Luong
e9cbf1b698
Create new WifiEntryPreference if WifiEntry object changes
...
WifiSettings2 should create a new WifiEntryPreference for a cached
WifiEntry key in case the underlying object has changed, so that updates
to the WifiEntry are still being listened to. This may happen
in situations where WifiPickerTracker swaps WifiEntries objects with the same
key in the getWifiEntries() list, such as when handling network
suggestions (which are kept as separate objects from the non-suggestion
entries).
Bug: 157174114
Test: manual visual verification in wifi picker of adding a network
suggestion and seeing the entry summary for that SSID change to the
suggestion summary.
Change-Id: I9cfdae8207ae919e9e1cbf4c200eaa951a229b3f
Merged-In: I48ac11364b06887cc4059bcda863b456e206c9bd
2020-05-21 01:29:56 +00:00
Jeff Tinker
c8baa3edf7
[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
am: a5f7479f5a
-s ours am: 01b3da1dbd
am: 70aa2882a6
...
Change-Id: Ic649d0d9dc9884139343a6017d600e3e1065c91f
2020-05-20 20:46:54 +00:00
Jeff Tinker
70aa2882a6
[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
am: a5f7479f5a
-s ours am: 01b3da1dbd
...
Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e
2020-05-20 20:33:02 +00:00