Julia Reynolds
4764c6efda
Guard against NPE am: 663cc934d9 am: 68e09db264 am: a4a0288895 am: 3c30b2a6cb
...
Change-Id: I5f5c1dc5ab48d8755bce0413b3ae010ceb7aaae0
2020-05-19 21:41:45 +00:00
Julia Reynolds
0df65c4060
Guard against NPE am: 663cc934d9 am: f704b4eb6d am: cf6ab28a93 am: 1b83559057
...
Change-Id: Ied8ddceed74e8911577f82b0cb97d9c3d60bef57
2020-05-19 21:41:06 +00:00
Automerger Merge Worker
c8b77ea7de
Merge "Guard against NPE am: 663cc934d9 am: f704b4eb6d am: a59ad6a112" into rvc-qpr-dev-plus-aosp
2020-05-19 21:26:02 +00:00
Julia Reynolds
a28452efac
Guard against NPE am: 663cc934d9 am: f704b4eb6d am: a59ad6a112
...
Change-Id: Ia98e4c3f8dbb6189c3ec2523982fbb9568d0d3d3
2020-05-19 21:25:58 +00:00
Julia Reynolds
3c30b2a6cb
Guard against NPE am: 663cc934d9 am: 68e09db264 am: a4a0288895
...
Change-Id: Iae901126fb8b1f369a5af206e437674a9ad0fa10
2020-05-19 21:25:54 +00:00
Julia Reynolds
1b83559057
Guard against NPE am: 663cc934d9 am: f704b4eb6d am: cf6ab28a93
...
Change-Id: I2eec5d25ae85a2097b9ead39d9121d53749ff348
2020-05-19 21:25:33 +00:00
Julia Reynolds
a4a0288895
Guard against NPE am: 663cc934d9 am: 68e09db264
...
Change-Id: I4442234ea792776dbdca92a3398311c8d48a2f14
2020-05-19 21:19:33 +00:00
Julia Reynolds
cf6ab28a93
Guard against NPE am: 663cc934d9 am: f704b4eb6d
...
Change-Id: I8f144190fadded2ddb645b8741596e660f6ff720
2020-05-19 21:13:54 +00:00
Julia Reynolds
a59ad6a112
Guard against NPE am: 663cc934d9 am: f704b4eb6d
...
Change-Id: I572d52ea3a210dbcc5c1108fab4f76dc88f218da
2020-05-19 21:13:44 +00:00
Julia Reynolds
68e09db264
Guard against NPE am: 663cc934d9
...
Change-Id: I56317984b7803128829f77889dccd4d69601bad9
2020-05-19 21:02:18 +00:00
Julia Reynolds
f704b4eb6d
Guard against NPE am: 663cc934d9
...
Change-Id: If2121f13113055dc1a31c82046e8d5b2000fceba
2020-05-19 21:02:08 +00:00
Julia Reynolds
d1d32e7d22
Fix button selected state
...
Test: toggle between buttons with a11y service
Fixes: 156990411
Change-Id: I421c6d2e9762794bdf8a090db8a808678ffd8a1c
2020-05-19 14:36:32 -04:00
Automerger Merge Worker
1317f343b2
Merge "Map local context menu to the correct item am: a1c0269027 am: 7e17205035" into rvc-d1-dev-plus-aosp am: 615eb19ecf am: f316f94a0f
...
Change-Id: Id9c0d6f64d3d18d7fd152ffd2554640c502e4d9c
2020-05-19 18:31:17 +00:00
Julia Reynolds
d83ac070e6
Map local context menu to the correct item am: a1c0269027 am: f633a228ba am: 5c14ded7eb am: 2b7373fd28
...
Change-Id: I3585e2673105fa5dc7336cbd1cae1b0f17e22d0f
2020-05-19 18:30:59 +00:00
Julia Reynolds
0cfa944c01
Map local context menu to the correct item am: a1c0269027 am: f633a228ba am: 8bb36a8ff6 am: 3d43cebcb4
...
Change-Id: Ida6272be9e6bb50b895e4d16a22f0bfe743f1d6f
2020-05-19 18:30:07 +00:00
Automerger Merge Worker
f316f94a0f
Merge "Map local context menu to the correct item am: a1c0269027 am: 7e17205035" into rvc-d1-dev-plus-aosp am: 615eb19ecf
...
Change-Id: I628276252961e7b98d3b5e60ed03bf568db6fef5
2020-05-19 18:16:34 +00:00
Julia Reynolds
2b7373fd28
Map local context menu to the correct item am: a1c0269027 am: f633a228ba am: 5c14ded7eb
...
Change-Id: Ia5b6c0fe84ae7dfb28cb611b43798b16a8b547d3
2020-05-19 18:16:21 +00:00
Julia Reynolds
3d43cebcb4
Map local context menu to the correct item am: a1c0269027 am: f633a228ba am: 8bb36a8ff6
...
Change-Id: Iacff6068c83577980bb557e38d4fc32f3bc7a2aa
2020-05-19 18:15:44 +00:00
Automerger Merge Worker
615eb19ecf
Merge "Map local context menu to the correct item am: a1c0269027 am: 7e17205035" into rvc-d1-dev-plus-aosp
2020-05-19 18:03:07 +00:00
Julia Reynolds
95d2a48a31
Map local context menu to the correct item am: a1c0269027 am: 7e17205035
...
Change-Id: I91669dde9e2ac2c7d794b3555da7004f943abe43
2020-05-19 18:03:02 +00:00
Julia Reynolds
5c14ded7eb
Map local context menu to the correct item am: a1c0269027 am: f633a228ba
...
Change-Id: I06a340732247495b9166d6dd1800037d779a6460
2020-05-19 18:02:58 +00:00
Julia Reynolds
8bb36a8ff6
Map local context menu to the correct item am: a1c0269027 am: f633a228ba
...
Change-Id: Iee67516dc16338e47fdead78a2164667ece59792
2020-05-19 18:02:39 +00:00
Julia Reynolds
7e17205035
Map local context menu to the correct item am: a1c0269027
...
Change-Id: Ibaa8644feff3c098b1a384c7dfb645d0fb30d5c0
2020-05-19 17:45:07 +00:00
Julia Reynolds
f633a228ba
Map local context menu to the correct item am: a1c0269027
...
Change-Id: I0d264207efb081a1f6f3583bc39f080830f775c1
2020-05-19 17:44:48 +00:00
Julia Reynolds
663cc934d9
Guard against NPE
...
Test: manual, launching screen from locked lock screen
Fixes: 153569405
Change-Id: Idb546f58623792d94a43ca6659f7498de3beec94
2020-05-19 12:29:24 -04:00
Julia Reynolds
a1c0269027
Map local context menu to the correct item
...
Since the position of the item might have changed
if ohter items were deleted
Test: manual: delete item 0/2, item 2/2, then 1/2
Fixes: 156716919
Change-Id: I989a064d3a3f89b5c2692d5a687d759c842e080c
2020-05-19 11:22:31 -04:00
Treehugger Robot
8db4a1113f
Merge "Preserve icon for "manage space"" am: c39b3dfd76 am: d71f2b3f1a am: 045783bd37 am: 09ff5e2e5a am: ff60590b66
...
Change-Id: I8a7d9ac6c6b433aad2c306ca27984dc274cb4974
2020-05-19 13:18:28 +00:00
Treehugger Robot
ff60590b66
Merge "Preserve icon for "manage space"" am: c39b3dfd76 am: d71f2b3f1a am: 045783bd37 am: 09ff5e2e5a
...
Change-Id: I547b11e8da5d8192e39bc699b10aa3b34e57d661
2020-05-19 12:41:34 +00:00
SongFerngWang
414f8b8fe6
Add corresponding code for the new NR condition
...
Bug: 155915216
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (Pass)
Change-Id: I171ea0a8adc621ad5e9dc5cd2090e431b923e775
2020-05-19 12:32:57 +00:00
Treehugger Robot
09ff5e2e5a
Merge "Preserve icon for "manage space"" am: c39b3dfd76 am: d71f2b3f1a am: 045783bd37
...
Change-Id: I3212e4606d52237adbf470dd257555c7e188ef28
2020-05-19 12:27:22 +00:00
Treehugger Robot
045783bd37
Merge "Preserve icon for "manage space"" am: c39b3dfd76 am: d71f2b3f1a
...
Change-Id: I6b0b1a56980191bc551ba409bfce8e104ca2706a
2020-05-19 12:12:16 +00:00
Treehugger Robot
d71f2b3f1a
Merge "Preserve icon for "manage space"" am: c39b3dfd76
...
Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487
2020-05-19 11:58:13 +00:00
Treehugger Robot
c39b3dfd76
Merge "Preserve icon for "manage space""
2020-05-19 11:42:46 +00:00
Zoey Chen
a3e781b3f5
[automerger skipped] Merge "[Settings] Code refactor" am: f4d59078fb am: 6622ff7181 -s ours am: 2f10922368 -s ours am: 4ca66a8a2f -s ours am: e0458e44c1 -s ours
...
am skip reason: Change-Id I3fa9dcc630b7612c1af3300024dee4f8deb6b308 with SHA-1 0065f2e460
2020-05-19 11:34:58 +00:00
Zoey Chen
e0458e44c1
[automerger skipped] Merge "[Settings] Code refactor" am: f4d59078fb am: 6622ff7181 -s ours am: 2f10922368 -s ours am: 4ca66a8a2f -s ours
...
am skip reason: Change-Id I3fa9dcc630b7612c1af3300024dee4f8deb6b308 with SHA-1 0065f2e460
2020-05-19 11:11:56 +00:00
Zoey Chen
4ca66a8a2f
[automerger skipped] Merge "[Settings] Code refactor" am: f4d59078fb am: 6622ff7181 -s ours am: 2f10922368 -s ours
...
am skip reason: Change-Id I3fa9dcc630b7612c1af3300024dee4f8deb6b308 with SHA-1 0065f2e460
2020-05-19 10:48:59 +00:00
Zoey Chen
2f10922368
[automerger skipped] Merge "[Settings] Code refactor" am: f4d59078fb am: 6622ff7181 -s ours
...
am skip reason: Change-Id I3fa9dcc630b7612c1af3300024dee4f8deb6b308 with SHA-1 0065f2e460
2020-05-19 10:29:13 +00:00
Zoey Chen
6622ff7181
Merge "[Settings] Code refactor" am: f4d59078fb
...
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Zoey Chen
f4d59078fb
Merge "[Settings] Code refactor"
2020-05-19 09:51:16 +00:00
Zoey Chen
ce2cb9805b
[automerger skipped] Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca am: 2673571d28 -s ours am: 040cd610f6 -s ours am: 77a1d02c21 -s ours am: 21a71edf21 -s ours
...
am skip reason: Change-Id Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657 with SHA-1 7ea8e7ef1e
2020-05-19 09:36:49 +00:00
Zoey Chen
21a71edf21
[automerger skipped] Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca am: 2673571d28 -s ours am: 040cd610f6 -s ours am: 77a1d02c21 -s ours
...
am skip reason: Change-Id Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657 with SHA-1 7ea8e7ef1e
2020-05-19 09:16:36 +00:00
Zoey Chen
77a1d02c21
[automerger skipped] Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca am: 2673571d28 -s ours am: 040cd610f6 -s ours
...
am skip reason: Change-Id Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657 with SHA-1 7ea8e7ef1e
2020-05-19 08:59:48 +00:00
Bonian Chen
e9911c28cf
[Settings] Code refactor
...
Code refactor.
Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
040cd610f6
[automerger skipped] Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca am: 2673571d28 -s ours
...
am skip reason: Change-Id Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657 with SHA-1 7ea8e7ef1e
2020-05-19 08:41:48 +00:00
Zoey Chen
2673571d28
Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
...
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Zoey Chen
d7dbfe04ca
Merge "[Settings] Code refactor for availability session"
2020-05-19 08:04:42 +00:00
TreeHugger Robot
05cc1e7076
Merge "[Wi-Fi] Remove all files in com.android.settings.wifi.savedaccesspoints"
2020-05-19 07:56:37 +00:00
TreeHugger Robot
739416db8e
Merge "[Wi-Fi] Enhance AddAppNetworksFragment unit test cases"
2020-05-19 05:01:01 +00:00
Mehdi Alizadeh
1fb434045d
Reads back inset scale value from config.xml instead of hardcoded values am: a5eb615038 am: 01f83bc633 am: 99167395f4 am: a016d44b38
...
Change-Id: Idea621086f4525bb56da695dfcabec2a2370b3a8
2020-05-19 04:23:02 +00:00
Mehdi Alizadeh
2f77c9e637
Reads back inset scale value from config.xml instead of hardcoded values am: a5eb615038 am: bbcc3cd0c4 am: 5c5d7022cf am: f4cf6725a1
...
Change-Id: I6753bd86fd854f7a0ea344be50b4f64b70e66ee2
2020-05-19 04:22:29 +00:00
