jasonwshsu
c2dd8ff32a
Update the formal image for magnification
...
* full_screen and window_screen image
Fix: 146019459
Test: manual test
Change-Id: I53dc9200f3c1460f9a1691fd72e55f1b6fac8c96
2020-08-13 17:55:46 +08:00
Bonian Chen
42faeb8949
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours am: db8bd6ac06
-s ours am: 636d86d5eb
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: If565260efaf56506d6d23ada63390a9267eb35d1
2020-08-12 05:43:42 +00:00
Bonian Chen
636d86d5eb
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours am: db8bd6ac06
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: Iad8632321126718672589b5f7dcc91947579dd7d
2020-08-12 05:25:45 +00:00
Bonian Chen
db8bd6ac06
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: I2a0c58e8bca107541ae83985eba12f2b58ce4d59
2020-08-12 05:08:39 +00:00
Bonian Chen
8c8761b74e
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: Idf79d9aa5960948943959c262a01d4c3f7d3c97a
2020-08-12 04:42:00 +00:00
Bonian Chen
59dfd94170
Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: I84b5d35b4a9a0ea77597c45b445768bd2782c845
2020-08-12 04:24:57 +00:00
Bonian Chen
60d00b58f3
Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry"
2020-08-12 04:10:10 +00:00
tim peng
e581cab958
Merge "Display "pair new" only when local output device is available."
2020-08-12 03:05:53 +00:00
TreeHugger Robot
232aaec569
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-12 02:36:07 +00:00
TreeHugger Robot
3c8f93a6a5
Merge "Update inclusive language for Accessibility Settings"
2020-08-12 02:28:23 +00:00
TreeHugger Robot
ec93f346fe
Merge "Update char limit for title of swipe for notificaiton gesture preference"
2020-08-11 10:39:11 +00:00
Bonian Chen
f570a8afff
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours am: 17a4871845
-s ours am: 6e8d241cd9
-s ours am: 0083abcd3b
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: Ib455fb2040cd6593d295857e53c6e3e5123a8a8f
2020-08-11 09:41:27 +00:00
Bonian Chen
0083abcd3b
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours am: 17a4871845
-s ours am: 6e8d241cd9
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: Id0fff72461e532250c723b29a13036146c172f48
2020-08-11 09:15:16 +00:00
Jerry Chang
cbd88e0eff
Update char limit for title of swipe for notificaiton gesture preference
...
Bug: 163359886
Test: manual check preference strings in settings
Change-Id: I1f5becde86ea514c30b11e5755feef2e01d91e04
2020-08-11 17:02:37 +08:00
Bonian Chen
6e8d241cd9
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours am: 17a4871845
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: I16c99ac5fe38cb7391858d02abd4b21539d6d032
2020-08-11 08:57:21 +00:00
Betty Chang
b9c21e38cc
Merge "[Testing] Use AndroidJUnit4 instead in DataConnectivityListenerTest"
2020-08-11 08:45:55 +00:00
Bonian Chen
17a4871845
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: Ifda29d94ccdae085264cf14d4b8064db055b4ea2
2020-08-11 08:37:45 +00:00
Bonian Chen
a9a69c6aa3
Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: I92dbf184a274d3a22ad597bff0b24d2c44218266
2020-08-11 08:26:23 +00:00
Bonian Chen
f116c5fae7
Merge "Override 2 getSliceUri() instance to return platform slice"
2020-08-11 08:05:10 +00:00
changbetty
7f57ef4766
[Testing] Use AndroidJUnit4 instead in DataConnectivityListenerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
Bug: 162048313
Test: atest -c DataConnectivityListenerTest
Change-Id: I8f05ac7f5f14cb2b990da137099a22e4a89fcc37
2020-08-11 15:32:58 +08:00
Fan Zhang
6c046831de
Override 2 getSliceUri() instance to return platform slice
...
(This is not a clear cherry-pick, @Override need to be removed.)
Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
2020-08-11 04:24:27 +00:00
Bonian Chen
386bd9c7b9
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours am: e8c233c4dc
-s ours am: 41a77501c3
-s ours am: cb6df05e95
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I286cdd6bd135dc4bb95657b13ad106f460040df2
2020-08-11 03:51:04 +00:00
Bonian Chen
cb6df05e95
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours am: e8c233c4dc
-s ours am: 41a77501c3
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I0d12957f0e00665646d7be0b1d919033450d7fbc
2020-08-11 03:35:42 +00:00
Bonian Chen
41a77501c3
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours am: e8c233c4dc
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I4e6af4b49d9e9649a790f32a72ccb8b6d5d138c5
2020-08-11 03:18:30 +00:00
Bonian Chen
e8c233c4dc
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I15340b9727806d93ad352c154e0b7ed6d16d9def
2020-08-11 02:58:33 +00:00
timhypeng
113ac8102a
Display "pair new" only when local output device is available.
...
-If media app does not support cast->phone transferring, local output
audio device is unavailable. "pair new" is for Bluetooth which should be
also unavilable.
-These types are local output audio devices:
TYPE_BUILTIN_SPEAKER
TYPE_WIRED_HEADSET
TYPE_WIRED_HEADPHONES
TYPE_USB_DEVICE
TYPE_USB_HEADSET
TYPE_USB_ACCESSORY
TYPE_DOCK
TYPE_HDMI
Bug: 163095048
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib844c7546e1946cb87fac04cb8b2b8f4acf06451
2020-08-11 10:52:57 +08:00
Bonian Chen
6cc261d709
Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I030d2a19b44d5c5dd91ef07be723f897d0ea057b
2020-08-11 02:45:31 +00:00
Bonian Chen
5c4154b2e4
Merge "Add interface and extend db to support storing slice uris"
2020-08-11 02:23:56 +00:00
TreeHugger Robot
efc601f4a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: 56f65fed8f
-s ours am: 326ed12f4c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: I463e6332499ae8cf1481a310531350f7ec56b24a
2020-08-10 17:54:28 +00:00
TreeHugger Robot
9f0f960e48
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: f90d25620d
-s ours am: c20d521be0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: I71c3bded604586ccbf7bf90eb55af6562f28dd65
2020-08-10 17:53:25 +00:00
TreeHugger Robot
326ed12f4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: 56f65fed8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: Idc7c858d661a0b9e763e0a93cdd9ed3bdf377c99
2020-08-10 17:38:22 +00:00
TreeHugger Robot
c20d521be0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: f90d25620d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: I45a9b1c6d35d0a39637747f7d4714126f8e2bdb8
2020-08-10 17:37:23 +00:00
TreeHugger Robot
56f65fed8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: I2fb7a80bdf3e12d70c16db7cdd1602ec5acd4f68
2020-08-10 17:17:25 +00:00
TreeHugger Robot
f90d25620d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: Ic77a45f1573b50befe00545853cf774ade34f7fa
2020-08-10 17:16:16 +00:00
TreeHugger Robot
1419ef2874
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-10 17:03:22 +00:00
Jiashen Wang
889f702829
Change MobileNetworkUtils to use EuiccManager.isSupportedCountry
...
Currently LPA passed supported/unsupported countries to Settings by
writing the value into properties which is not ideal. Instead, we should
call EuiccManager.isSupportedCountry instead.
Bug: 147674689
Test: 1) Manually tested by flashing the change to the device
2) Change LPA to override onGetIsEuiccSupportedCountry
3) Make sure LPA can get the request
Merged-In: Ib136beea325eabdfbd8a6a843611143958dce603
Change-Id: If406d9d803affa334c1ad4f871fcfdc0561c9bf6
2020-08-10 22:57:02 +08:00
Bonian Chen
d6e2980e9a
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours am: 528b77a6e3
-s ours am: 06b5916f4f
-s ours am: 86a0d8c7cb
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: I0a5918b92afb1aa4630ad89f2d0ebf145181225d
2020-08-10 12:34:04 +00:00
Bonian Chen
86a0d8c7cb
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours am: 528b77a6e3
-s ours am: 06b5916f4f
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: I5703e91daee635e36f2c3a71d12bbcd220978d72
2020-08-10 12:17:45 +00:00
Bonian Chen
06b5916f4f
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours am: 528b77a6e3
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: I468782ddc0c2afd6e353194c051fd5a6508c1b30
2020-08-10 12:02:02 +00:00
Bonian Chen
528b77a6e3
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: If755e66d86fb32a43a36c74a2bf37e94694f7fa4
2020-08-10 11:43:42 +00:00
Bonian Chen
0ed11daae3
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours am: cfe7584cec
-s ours am: db42e97e81
-s ours am: f9573a79cd
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: Ie7d33c7bd57c4401ca9c07e6526333e056cca90e
2020-08-10 11:43:42 +00:00
Bonian Chen
f9573a79cd
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours am: cfe7584cec
-s ours am: db42e97e81
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I99939c5b5640de3af3ceb7624c893c4a4a101b2d
2020-08-10 11:27:36 +00:00
Bonian Chen
8977c4ce49
Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: Idb1032b0e1513650da785866e85eef4bff64827f
2020-08-10 11:21:00 +00:00
Bonian Chen
db42e97e81
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours am: cfe7584cec
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I235aaed5dce0a37f429db30ffb6b16a417a8f94d
2020-08-10 11:09:23 +00:00
Bonian Chen
7e6c957fea
Merge "Show/hide 5G preferred network type also consider allowed_network_type"
2020-08-10 11:07:41 +00:00
Bonian Chen
cfe7584cec
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I012950d0a764a1655ca06e89dd9e98962f386a17
2020-08-10 10:52:15 +00:00
Bonian Chen
80b3bb5141
Merge "Remove PreferenceCategory wrapper" am: 75124d794c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: Ia40d77f7daf669323275aab1b05ba81a14c5f499
2020-08-10 10:31:58 +00:00
Bonian Chen
75124d794c
Merge "Remove PreferenceCategory wrapper"
2020-08-10 10:12:14 +00:00
Raff Tsai
91d40cdb21
Remove PreferenceCategory wrapper
...
- Avoid similiar issue in b/130396913
Bug: 124129485
Test: manual
Merged-In: I6f4698304210bacba5c76020c375dda49330d2cc
Change-Id: I9d5d856f586ab660a5adb17c0bb1f49e90eca198
2020-08-10 17:03:13 +08:00
Fan Zhang
f609df425d
Add interface and extend db to support storing slice uris
...
Bug: 126222433
Test: manual
Merged-In: Ie81e69477d297aa96a0daad02d56196c956271a3
Change-Id: Ifdae6fc47dc078ba83c211d07d6028f00f11e6f2
2020-08-10 16:50:21 +08:00