Jiashen Wang
624cea1b7a
Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd
am: 6538ee53cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221
Change-Id: Ibe4302c154adf38f4ee76e0279691e5d06304e2e
2020-09-17 02:52:12 +00:00
Jiashen Wang
6538ee53cf
Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221
Change-Id: If39f36992de53f89ce07ef5ff1ddb597800dff58
2020-09-17 02:27:04 +00:00
TreeHugger Robot
dd8e325da4
Merge "Updates scale values on back sensitivity sliders"
2020-09-16 22:44:58 +00:00
Jiashen Wang
f537a702dd
Do not display eSIM activation option if the device is eSIm ignored
...
For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested
Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
2020-09-16 15:33:51 -07:00
Julia Reynolds
22b1bb81dd
Merge "Fix crash on rotation" am: ebfa9e31a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12586155
Change-Id: I4e84b6e751753d937689329b5f349ed87666bbbb
2020-09-16 15:02:47 +00:00
Julia Reynolds
ebfa9e31a1
Merge "Fix crash on rotation"
2020-09-16 13:21:31 +00:00
TreeHugger Robot
3528407e97
Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7
am: cdf6fb31f0
am: b116a4d253
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486
Change-Id: I4265146ddc98f5652e987ec88730083d86aef559
2020-09-16 05:04:14 +00:00
TreeHugger Robot
f5f63029c5
[automerger skipped] Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac
am: e8b47df453
-s ours am: bfdcceb223
-s ours
...
am skip reason: Change-Id I684501a20a67755b2196ba9d4b5565add01a5d01 with SHA-1 386df49bbc
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714
Change-Id: I997d82d2d0450316d39b37660a15f9f6a1812040
2020-09-16 04:59:03 +00:00
TreeHugger Robot
b116a4d253
Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7
am: cdf6fb31f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486
Change-Id: Id87a6f4c150f529c87b49833d7dc189f0d2a012a
2020-09-16 04:32:52 +00:00
TreeHugger Robot
bfdcceb223
[automerger skipped] Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac
am: e8b47df453
-s ours
...
am skip reason: Change-Id I684501a20a67755b2196ba9d4b5565add01a5d01 with SHA-1 386df49bbc
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714
Change-Id: Iad4e4209cbb2189103ef05582be3dfbe03c18576
2020-09-16 04:31:38 +00:00
TreeHugger Robot
cdf6fb31f0
Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486
Change-Id: I3de2dab20767ae2e3a132cf611b85b77cbe1fc56
2020-09-16 03:43:32 +00:00
TreeHugger Robot
e8b47df453
Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714
Change-Id: Ic3f113e706c9fe3f74eb61a2b980df9a271d806a
2020-09-16 03:42:54 +00:00
TreeHugger Robot
19af143fe7
Merge "Fix settings crash" into rvc-qpr-dev
2020-09-16 03:09:38 +00:00
TreeHugger Robot
2b52c56eac
Merge "Show just disconnected device on previously connected" into rvc-qpr-dev
2020-09-16 03:09:30 +00:00
Jeremy Goldman
9350529f9d
Merge "[Testing] AndroidJUnit4 RoamingPreferenceControllerTest" am: 953ed3dcd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559295
Change-Id: I0ca31fe9903bb1a63c38c4be0783095c2f0332f3
2020-09-16 01:09:22 +00:00
Jeremy Goldman
953ed3dcd2
Merge "[Testing] AndroidJUnit4 RoamingPreferenceControllerTest"
2020-09-16 00:48:31 +00:00
TreeHugger Robot
35e7a17b9f
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38
am: 9dc594b90d
am: f24ec05725
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713
Change-Id: Ifa1778fcbb4827375fdd19ccd486d9bdf12b7222
2020-09-16 00:17:40 +00:00
Arc Wang
1039628c5e
[automerger skipped] Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd
am: 84ac360560
-s ours am: f646e6aac9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I59bc1880efb8e3bffd97c27976ee048bab59f64d
2020-09-16 00:14:07 +00:00
Arc Wang
fec8f04712
[automerger skipped] [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68
am: 3782ff7edd
-s ours am: 5f3be310fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: Ie39d1a625d4db3078d19fe92eb112250dd8b4e41
2020-09-16 00:14:02 +00:00
Bonian Chen
ce5bd9fa62
[automerger skipped] Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
am: ccc406381a
am: 3864e2f218
am: 5d1da01e80
-s ours am: d039623d94
-s ours
...
am skip reason: Change-Id I81b3d6ac075666a45649c8d811832a40bdb1b41b with SHA-1 c3aa6d26ee
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: I8012cd334c73c71a190ad2c969e777fe84d67deb
2020-09-16 00:07:11 +00:00
TreeHugger Robot
40c9509748
Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev am: eacabd567f
am: bf4a795692
am: 5fa3aa40be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493712
Change-Id: I13b5c6368964ea13cd2012ea0f972eb11efd43c6
2020-09-16 00:02:00 +00:00
TreeHugger Robot
8d290b17a4
[automerger skipped] Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e
am: 2dfac98e04
-s ours am: 71350de040
-s ours
...
am skip reason: Change-Id I7a1451a36a31253b6be2203341bea4e59fed7c2b with SHA-1 bde100849e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392571
Change-Id: I199472b3a848764a9682ebaa370f9b8f470df92b
2020-09-15 23:33:48 +00:00
Bill Yi
99b8f106b8
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e
-s ours am: 46cde30768
-s ours am: fe8f27e508
-s ours am: 76798cd54a
-s ours am: 8195f76b67
-s ours
...
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12579472
Change-Id: I80744780dc0066538ef29584571ee7e7b1838b7c
2020-09-15 22:43:40 +00:00
Betty Chang
ee9cc69b06
Merge "[Testing] Use AndroidJUnit4 instead in DataUsageInfoControllerTest" am: 195aa70291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523488
Change-Id: Iba7fc112380a6d8818a9a3f4f1c700d2a763cb30
2020-09-15 21:36:35 +00:00
TreeHugger Robot
ccae3a27b9
Merge "Fix the ANR in panel when changing volume continuously" am: 8678e5112a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401650
Change-Id: I738725b4b3105e51671badb473d41d71cd39037d
2020-09-15 21:35:07 +00:00
Betty Chang
5b4e46bc3e
Merge "[Testing] Use AndroidJUnit4 instead in CarrierSettingsVersionPreferenceControllerTest" am: 090f32f03d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12555522
Change-Id: Ia2974eaed5ac6b23d2c041c664a8514373db0e2a
2020-09-15 21:35:00 +00:00
TreeHugger Robot
1876422fec
Merge "Hide the icon if didn't have media session or album art" am: 34937eb21e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533598
Change-Id: I7a08fe44cb3c8505baa2ce9a6178fbc7a1cae225
2020-09-15 21:34:52 +00:00
TreeHugger Robot
7b5a0e3ca5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 195b27edb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12583566
Change-Id: Ib5dead3afd6a1a64070dc43f612d0e84db5134e7
2020-09-15 21:34:46 +00:00
TreeHugger Robot
0b2fc2d44c
Merge "Add a feature flag for settings contextual home." am: 7fb5f93858
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12556038
Change-Id: I8c8d56acbe8537c998587e970f8f170993308de4
2020-09-15 21:34:36 +00:00
Bill Yi
8c1810f019
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf99f9c34a
-s ours am: de75424d55
-s ours am: afd945f6c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12580112
Change-Id: I7e8210839050e6522f0bb8fab6b83f6a53c49284
2020-09-15 21:26:43 +00:00
TreeHugger Robot
09c4cd7922
Merge "Merge mainline-prod into master" am: d9e691b536
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12562389
Change-Id: I462ade856b927d2efb7de6fca1753f454b8377a0
2020-09-15 21:26:27 +00:00
Treehugger Robot
00b6953dfe
Merge "Add goldmanj to settings owners files." am: 56349f714d
am: 26f8b54e38
am: 91286c4ec9
am: 368ae3f9b9
am: ae268ea40d
am: 9b5a2ff761
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948
Change-Id: I0b77ce3cd5aa6d1e5172037f283ea04f3078dc6e
2020-09-15 21:26:20 +00:00
TreeHugger Robot
f24ec05725
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38
am: 9dc594b90d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713
Change-Id: I69d35ef9ff274b49f50a1aaff229b5f81863a769
2020-09-15 21:05:58 +00:00
Arc Wang
f646e6aac9
[automerger skipped] Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd
am: 84ac360560
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I2aa61916205da9cd781743c7ee37b246a92f621a
2020-09-15 21:04:46 +00:00
Arc Wang
5f3be310fe
[automerger skipped] [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68
am: 3782ff7edd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I9af24fe87375c9c2e4cd58b9f1e6993d3c96d323
2020-09-15 21:04:43 +00:00
Bonian Chen
d039623d94
[automerger skipped] Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
am: ccc406381a
am: 3864e2f218
am: 5d1da01e80
-s ours
...
am skip reason: Change-Id I81b3d6ac075666a45649c8d811832a40bdb1b41b with SHA-1 c3aa6d26ee
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: I11de226ad2a03c82c556c840593acc60ae553e00
2020-09-15 21:02:24 +00:00
TreeHugger Robot
5fa3aa40be
Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev am: eacabd567f
am: bf4a795692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493712
Change-Id: Iac7763caaa9fa5464e1ea5c560cca646976f8c44
2020-09-15 20:59:28 +00:00
TreeHugger Robot
71350de040
[automerger skipped] Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e
am: 2dfac98e04
-s ours
...
am skip reason: Change-Id I7a1451a36a31253b6be2203341bea4e59fed7c2b with SHA-1 bde100849e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392571
Change-Id: I12ce703a07836dfb9f6abc1bd922cfccfeac5606
2020-09-15 20:56:34 +00:00
Bill Yi
8195f76b67
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e
-s ours am: 46cde30768
-s ours am: fe8f27e508
-s ours am: 76798cd54a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12579472
Change-Id: Idc33ab6eefb6f2830bc1535088200d2f6d824ddf
2020-09-15 20:32:14 +00:00
Quang Luong
f39e5b1f0c
Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971
am: 8704114f02
am: 77e32049bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567
Change-Id: I8b3957122b5b7df2340e1096123fc50c26e98414
2020-09-15 20:20:16 +00:00
Bill Yi
6cc5cdc8b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b
-s ours am: bf6337ed40
-s ours am: d7b3015b5f
-s ours am: 2da441b02f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12564809
Change-Id: Idf7e59a9b1fe18e6abf5b07c3dfb8e890f20108c
2020-09-15 20:19:32 +00:00
Bill Yi
2f4f15fa1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d10db1189
-s ours am: 53286dbe5d
-s ours am: 4f859db3d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12564810
Change-Id: Ie0bd4eed486cfa69b345615747a765d0b97daa7f
2020-09-15 20:19:20 +00:00
Bill Yi
5b1e422171
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b
-s ours am: e02435c0d5
-s ours am: 3cd0a8710e
-s ours am: 4c1e13f518
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12564809
Change-Id: Ic36a145b32986ab18f1aa36ef2e15498724e43fd
2020-09-15 20:19:11 +00:00
Bonian Chen
92b3dce865
[automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236
am: e73b25e37b
am: 42710f069d
am: 07536baadf
-s ours am: 8b498d237b
-s ours am: 4774e8107a
-s ours
...
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: Ib5cfec3cae5ad44a71ac3966666193ea9962b04e
2020-09-15 20:19:00 +00:00
Bonian Chen
532a243a42
[automerger skipped] Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2
am: 5dba10a956
am: 5975853b18
am: 0f2bc3bad9
am: e68a8c4953
-s ours am: 0a3a51bdea
-s ours
...
am skip reason: Change-Id I2854147c956faa633a9682eee0028db6cd2d3912 with SHA-1 95b129c87d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: Ic15eda37db69814a0b6924e13813d613cbc46eb7
2020-09-15 20:18:41 +00:00
Jeremy Goldman
b1f8405a83
[Testing] AndroidJUnit4 RoamingPreferenceControllerTest
...
Test: atest -c RoamingPreferenceControllerTest
Change-Id: I155b1c36381b65d23ca1745e72a6f8388f6909e3
2020-09-15 19:53:54 +00:00
TreeHugger Robot
9dc594b90d
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713
Change-Id: I2bd0c2be1c9d9856f568df93339d526d1fed145a
2020-09-15 10:21:23 +00:00
Arc Wang
84ac360560
Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I1831acc1db85fbf374a927897d0a57d29f43c2f0
2020-09-15 10:20:55 +00:00
Arc Wang
3782ff7edd
[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I862192e840cbf25f8fe713b243fd17a054906c16
2020-09-15 10:20:53 +00:00
TreeHugger Robot
a21c26df38
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev
2020-09-15 09:54:08 +00:00