Bonian Chen
d9d9a9be8d
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev
2020-05-27 08:08:35 +00:00
Automerger Merge Worker
88a7bfdc96
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours" into rvc-d1-dev-plus-aosp
2020-05-27 07:12:57 +00:00
TreeHugger Robot
d2de2e054f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 891b3917e8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I474f90c6f769aa6d2ee3043c1bd86e33362857fb
2020-05-27 07:12:45 +00:00
TreeHugger Robot
046cf71dfe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia72d1361b589d5006efec99ce2fe97086c3e4f17
2020-05-27 07:12:45 +00:00
TreeHugger Robot
891b3917e8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia9d2a1630c170ac9153c055552a67747ef74bc2f
2020-05-27 07:02:32 +00:00
TreeHugger Robot
16f777f19d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I45400236a3c22758037d228e3bb270cbc7900f7d
2020-05-27 07:01:58 +00:00
TreeHugger Robot
8b32bee65b
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-27 06:39:10 +00:00
Yanting Yang
7806bd93ab
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0
...
Change-Id: Ib3caafb0d48d328a8001554d2e9f484e94fb611e
2020-05-27 06:03:47 +00:00
Yanting Yang
85b3154d07
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: bf4f72b1fa
...
Change-Id: I12a4863f08261286a917107ada5caec420736814
2020-05-27 06:03:17 +00:00
Automerger Merge Worker
f544256d76
Merge "Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3" into rvc-d1-dev-plus-aosp
2020-05-27 06:02:47 +00:00
tim peng
ceb23093e9
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484
...
Change-Id: I5a6472a35315e5a2add2e8029560382b8227eec8
2020-05-27 06:02:40 +00:00
tim peng
c8ac688630
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3
...
Change-Id: I6aabf39f353225da4c6a73ac21ef4340e3cd2095
2020-05-27 06:02:32 +00:00
Yanting Yang
bf4f72b1fa
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e
...
Change-Id: I6eb31ab162338e52a754dc098752feefa6d8dcd0
2020-05-27 05:48:03 +00:00
Yanting Yang
78062db3c0
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e
...
Change-Id: I8e01770d89641ec469611bf15be4b68de0f22a3a
2020-05-27 05:47:48 +00:00
tim peng
642f7582f3
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e
...
Change-Id: I1db8e8958622895cc818b115ae84758266bfab80
2020-05-27 05:47:10 +00:00
tim peng
e20f765484
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e
...
Change-Id: Ie65855100b43c1f0829856d103f4dd5bde426d84
2020-05-27 05:46:56 +00:00
Yanting Yang
4e14ffd77e
Merge "Improve scrolling performance for App Info page" into rvc-dev
2020-05-27 05:37:36 +00:00
tim peng
49217faf8e
Merge "Non-deselectable routes can be deselected" into rvc-dev
2020-05-27 05:32:34 +00:00
TreeHugger Robot
de8892ebae
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b
...
Change-Id: Ifc733843c6d4c3bfe5ff8f1b553ef154c7108d1c
2020-05-27 05:25:39 +00:00
TreeHugger Robot
bcc9f31b2b
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev
2020-05-27 05:18:46 +00:00
Automerger Merge Worker
c391a7fc70
Merge "Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: b8301bceed" into rvc-d1-dev-plus-aosp
2020-05-27 05:16:30 +00:00
Paul Chang
7142a6d2c0
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: b8301bceed
...
Change-Id: I9a167f07ca5a878a2ece5f3c42dc8ab5f4ef7bb6
2020-05-27 05:16:26 +00:00
Paul Chang
5cbb7a1eb7
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33
...
Change-Id: I6eba1bc2cc500179579ab19b800b107d6be59845
2020-05-27 05:16:20 +00:00
Paul Chang
b8301bceed
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf
...
Change-Id: I66e57a0211b810dcd83017a30b87999f69927251
2020-05-27 04:59:11 +00:00
Paul Chang
4da1f84e33
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf
...
Change-Id: I8708a3ea80d1d030347a932c3d676ecf88c1d8bb
2020-05-27 04:58:51 +00:00
Paul Chang
f1fb7fb7cf
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev
2020-05-27 04:46:21 +00:00
TreeHugger Robot
0c009aab13
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1
...
Change-Id: I2f2c654d85306d405769bc1626202a03d6fb1f39
2020-05-27 04:17:28 +00:00
TreeHugger Robot
99b295c285
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48
...
Change-Id: Ibbf5efba18de6266f64a822dc022ede299c5ac60
2020-05-27 04:17:14 +00:00
TreeHugger Robot
6c0e4e9e48
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386
...
Change-Id: Idc6fe44f5c60e9bc82b6209a832b3d574e72a47a
2020-05-27 04:00:47 +00:00
TreeHugger Robot
eb1f444fb1
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386
...
Change-Id: I98da412048dc0dbe100826809173763c70d7a15e
2020-05-27 04:00:38 +00:00
TreeHugger Robot
6d93851386
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev
2020-05-27 03:46:25 +00:00
Treehugger Robot
6cefd1c525
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:12:18 +00:00
Treehugger Robot
5d03f7d60f
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:03:37 +00:00
Treehugger Robot
6ea2228e31
Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
...
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Treehugger Robot
d01838d8ce
Merge "Fix NPE if CarrierConfigManager is not available"
2020-05-27 01:36:46 +00:00
Adam Bookatz
e7465b0f5f
Opening Multiuser doesn't toggle it on
...
This does the following:
Simply opening Settings > Multiuser no longer
globally enables multiuser. The user would have
to actively toggle that switch to globally
enabled it.
(This reverts ag/7002640; a different solution for
that cl's bug is in the same topic as this cl.)
Bug: 137943217
Bug: 141372193
Bug: 149973281
Bug: 130270878
Test: manual: Settings > Multiuser doesn't turn on the systemui avatar
Test: manual: adb shell pm create-user A, does turn on sysui avatar
Change-Id: Ibfdd1dee408c7214d0a097c8d814dae87ffa82ac
2020-05-26 23:01:56 +00:00
Brad Ebinger
525a07ec7f
Fix NPE if CarrierConfigManager is not available
...
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
TreeHugger Robot
1aeb24b04c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours
...
am skip reason: subject contains skip directive
Change-Id: I05e4192ecbce3aa066f82a3220cbc1aab8c4c4fc
2020-05-26 18:37:21 +00:00
TreeHugger Robot
209c1ebbaf
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-26 18:25:43 +00:00
TreeHugger Robot
4791614cc8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I50bf5aae6d67a6e48450993102d032cfb07174e5
2020-05-26 18:18:32 +00:00
TreeHugger Robot
c6efa831c1
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-26 18:05:31 +00:00
Automerger Merge Worker
8eabaefd5d
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp
2020-05-26 17:21:31 +00:00
Grace Jia
3f0d810913
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7
...
Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
2020-05-26 17:21:21 +00:00
Grace Jia
6c794a43bc
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677
...
Change-Id: I91a833771ed23ba08cd04aa309de3a2c23bee5de
2020-05-26 17:21:11 +00:00
Grace Jia
8e8386c677
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88
2020-05-26 17:08:09 +00:00
Grace Jia
f29da1c2e7
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: Iecbd2c0627c28b68e76440cc2430e753a95fc94b
2020-05-26 17:08:06 +00:00
Grace Jia
5c7f6d1b98
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev
2020-05-26 16:52:42 +00:00
Edgar Wang
8b10ab93d8
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809
...
Change-Id: I5273e41730d30b028389e2191d5fdca85fc29164
2020-05-26 15:17:16 +00:00
Edgar Wang
331e53aae7
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903
...
Change-Id: I332b929c79d275251bcc5ee5a516cda4c094171d
2020-05-26 15:17:01 +00:00
Edgar Wang
e72f014903
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7
...
Change-Id: Ie45e6eb70dd491face353ea1d92dcc38ca7a73be
2020-05-26 15:05:05 +00:00
