TreeHugger Robot
48c2433c49
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev am: 637eeefb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97df85bdeacdd0d9032bbef7aa7800e1dc9db736
2021-03-02 07:20:21 +00:00
TreeHugger Robot
637eeefb53
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev
2021-03-02 06:17:55 +00:00
Yanting Yang
23b5a53d93
Merge "Clean up RestrictedHomepagePreference" into sc-dev am: 082de8bfd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694187
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieddb41929c43bf0c7e1786a2d2d76fb0c5110bb8
2021-03-02 05:19:07 +00:00
Yanting Yang
082de8bfd9
Merge "Clean up RestrictedHomepagePreference" into sc-dev
2021-03-02 04:15:54 +00:00
TreeHugger Robot
2f0f0db2ec
Merge "Update UI for factory reset flow" into sc-dev am: 0994940af2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13693503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ca0f0fd3d652bc44c4cf9308e748565f02dbb78
2021-03-02 02:22:53 +00:00
TreeHugger Robot
4a98bad643
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev am: 9531fb8ffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13664265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I327a90bda998ef4e25974bbf1e3bbc2a0348e1ff
2021-03-02 02:22:11 +00:00
TreeHugger Robot
0994940af2
Merge "Update UI for factory reset flow" into sc-dev
2021-03-02 02:04:43 +00:00
TreeHugger Robot
9531fb8ffb
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev
2021-03-02 01:53:04 +00:00
Janis Danisevskis
62637de424
Merge "Address nits from ag/13702356" into sc-dev am: 5e57390696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13711305
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ed4d080b81d91f6f130c70bc598457c91656431
2021-03-01 23:18:08 +00:00
Janis Danisevskis
5e57390696
Merge "Address nits from ag/13702356" into sc-dev
2021-03-01 22:33:46 +00:00
Weng Su
f1489b51a3
[Provider Model] Show connected networks in APM/APM networks
...
- Separate APM and APM network types from other Internet types because
they can coexist at the same time.
- Show no internet icon in airplane-mode networks.
- Show connected non-carrier(Wi-Fi) network in airplane-mode networks.
- Show connected Ethernet network when airplane mode on.
- Screenshot:
https://screenshot.googleplex.com/cr3eWNLMEuJ8zvP
https://screenshot.googleplex.com/6DiMqKBBnBoxxhN
Bug: 180778141
Bug: 180778839
Bug: 179106406
Test: manual test
atest -c ConnectedEthernetNetworkControllerTest \
InternetConnectivityPanelTest \
InternetPreferenceControllerTest \
InternetUpdaterTest
Change-Id: I861d5ce879facbb61dfdc5b7be943662d55bdcca
2021-03-02 02:59:11 +08:00
TreeHugger Robot
f5aac9aca1
Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev am: fd510f5b67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09e18fdadf130e00234c6016c24545036455d8c3
2021-03-01 10:36:00 +00:00
TreeHugger Robot
fd510f5b67
Merge "Include 1xRTT when updating set of RATs via "Allow 2G" toggle." into sc-dev
2021-03-01 09:35:13 +00:00
TreeHugger Robot
931078a79a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-02-28 07:50:34 +00:00
TreeHugger Robot
a3080f5f77
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3d4dc769bd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13718742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6de62f93c17d1505d1765dfa59a1e39d8ce0a104
2021-02-28 00:56:20 +00:00
TreeHugger Robot
e20070a3fc
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-02-28 00:36:33 +00:00
TreeHugger Robot
3d4dc769bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-28 00:13:12 +00:00
Bill Yi
2561a06e4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e208297835b5f69450476e17c35426362480c41
2021-02-27 12:40:54 -08:00
Bill Yi
289272c67c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iadc8958c5d4459d6e688cfaf5c627b661e0c9340
2021-02-27 11:53:28 -08:00
Bill Yi
e2e686d9cd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifca7084ed712f64cf4d1e47d5dbabe39b6e00bf0
2021-02-27 11:06:03 -08:00
Julia Reynolds
fff6dde818
Merge "Updates to NLS notif type filtering" into sc-dev am: 6698d3b2c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13691340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9c1ac17f70d6b1fa4b9185cd7947dcaff8f48e5
2021-02-27 15:54:14 +00:00
Julia Reynolds
6698d3b2c8
Merge "Updates to NLS notif type filtering" into sc-dev
2021-02-27 15:34:35 +00:00
Yomna Nasser
7c7977efae
Include 1xRTT when updating set of RATs via "Allow 2G" toggle.
...
Update BITMASK_2G to include 1xRTT when disabling/enabling 2G
via toggle in Enable2gPreferenceController. This is to align
with TelephonyManager's NETWORK_CLASS_BITMASK_2G.
Bug: b/163168917
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: Ia0e099b63a9089be8cd8bfd4211db9eb3c506fc3
2021-02-27 00:11:01 +00:00
Mill Chen
747597c72a
Make Reset Wi-Fi, mobile & bluetooth scrollable
...
After setting both font size and display size to largest and enabling
collapsing toolbar, the content in this page will be out of screen
and be unable to scroll. Updating ScrollView to NestedScrollView can fix
this kind of issue since ScrollView can't work with CoordinatorLayout.
Bug: 178458729
Test: visual verified
1) Set font size and display size to largest
2) Navigate to Settings -> System -> Reset options -> Reset Wi-Fi mobile
& bluetooth
3) Observe and check if the content area is able to scroll.
Change-Id: I63451b99c6caa9283a45499e1374a58ccc224bfb
2021-02-27 04:06:20 +08:00
Julia Reynolds
dc79f1ba99
Updates to NLS notif type filtering
...
- Allow an app to tell us they will never bridge a notification
type. We will then not let a user select that type
- Checkboxes everywhere.
Test: Settings unit
Bug: 181125165
Bug: 181124973
Change-Id: I73939d3d0e99016456e009b2f104cdded98411c6
2021-02-26 19:27:25 +00:00
Sally Yuen
e034f35cf1
Merge "Fix capitalization error for Reduce brightness" into sc-dev am: 8caf56ee46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3cd51f59a72569d572c74a8745aff9dea5f55dab
2021-02-26 18:16:26 +00:00
Sally Yuen
8caf56ee46
Merge "Fix capitalization error for Reduce brightness" into sc-dev
2021-02-26 17:11:46 +00:00
Janis Danisevskis
3ac41cc279
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev am: e067adcce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13702356
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I268cbf5ec0d25f86e4614fafd1f3edd5ea261d79
2021-02-26 16:58:15 +00:00
Janis Danisevskis
e2bfcf88b7
Address nits from ag/13702356
...
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I044beb29ad84b1b016075997979766035e8be49d
2021-02-26 08:13:12 -08:00
Janis Danisevskis
e067adcce7
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev
2021-02-26 16:05:13 +00:00
Treehugger Robot
3296755ff9
Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d am: a409521a64 am: 4e10002367
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e1974eb69cbdfb0e5323e594ff01e82b69168c2
2021-02-26 06:04:13 +00:00
Treehugger Robot
4e10002367
Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d am: a409521a64
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cbc5fd554cd49ffb52c0852a8537f53cf5e0f54
2021-02-26 05:28:17 +00:00
Treehugger Robot
a409521a64
Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72543a317bfd1302e5f2226516658f61e7f4547a
2021-02-26 04:33:43 +00:00
Treehugger Robot
08bea2183d
Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31b4a6e88530092dc2849dc4fb7e09c0d5463db3
2021-02-26 03:55:00 +00:00
Bob Badour
82798df54a
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings am: a73a67240c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701598
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iada5fa90a369fc0476be9a58facf465778622f20
2021-02-26 02:45:14 +00:00
Treehugger Robot
7086917968
Merge "Keystore 2.0: Update credential settings to use public Keystore API."
2021-02-26 01:50:16 +00:00
Janis Danisevskis
93af3137fc
Keystore 2.0: Update Wifi settings to use mostly public keystore API.
...
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-02-25 17:40:19 -08:00
Janis Danisevskis
a05bd65cb6
Keystore 2.0: Update credential settings to use public Keystore API.
...
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I377115aca6b2df8052ae118f986c2f713535b6ec
2021-02-25 15:58:22 -08:00
sallyyuen
c5de80db1c
Fix capitalization error for Reduce brightness
...
Bug: b/181265718
Test: n/a
Change-Id: Iceaac4c701dc382e62764bab42e4f3768fa7d0cf
2021-02-25 15:11:20 -08:00
Bob Badour
a73a67240c
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
...
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
protos/Android.bp
tests/anomaly-tester/Android.bp
tests/componenttests/Android.bp
tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
tests/perftests/Android.bp
tests/robotests/Android.bp
tests/uitests/Android.bp
tests/unit/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I58a85aced69923fa9a8e5a2b89ecfdd33de5e05c
2021-02-25 15:05:14 -08:00
Bob Badour
2984c04968
Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 18e9723489
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iabca0d70cea8407f465a6cfcfc2854407a68595b
2021-02-25 20:57:38 +00:00
Bob Badour
18e9723489
Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
...
This reverts commit 0e73d05c74 .
Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
2021-02-25 11:52:32 -08:00
Treehugger Robot
e0e483aec1
Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9 am: 181abccf09 am: 4357b14563
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9cbfce6d31251b1679553f9b49fa3f2ec3d1aec7
2021-02-25 17:20:26 +00:00
Treehugger Robot
4357b14563
Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9 am: 181abccf09
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51c83010ba124a058173dbeec07465b243a366e4
2021-02-25 16:36:25 +00:00
Treehugger Robot
181abccf09
Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib879a1f6e28ca9d97391aedea77b064632330b75
2021-02-25 15:22:31 +00:00
Treehugger Robot
5e85b6b2a9
Merge "Add OWNERS" am: f69f3ed7dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46ab676806c0a211818a2f0465a28dc97d3a64d3
2021-02-25 14:47:30 +00:00
TreeHugger Robot
83293a9d3f
Merge "Fix talkback will speak "disabled" when select empty preference" into sc-dev am: b24d222e71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13693476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49ea2727798086a5fe59850af067c6fdaa4739f3
2021-02-25 14:46:53 +00:00
Treehugger Robot
f69f3ed7dc
Merge "Add OWNERS"
2021-02-25 14:19:48 +00:00
TreeHugger Robot
b24d222e71
Merge "Fix talkback will speak "disabled" when select empty preference" into sc-dev
2021-02-25 13:35:14 +00:00
Paul Hu
2b4987a6d3
[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856 am: 155d4d6cd3 -s ours am: 8af9ea6bf1 -s ours
...
am skip reason: Change-Id Iba4b121a4ddf3f04252aa0355e0e6494a593682a with SHA-1 6151c227e0 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I728dab3d67cdffaee86e3847e956a391d6834c8d
2021-02-25 11:03:36 +00:00