Commit Graph

79708 Commits

Author SHA1 Message Date
TreeHugger Robot
3b5c6574c3 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: I7bd3dc05d2e6e6f7c96200f223116ee0c1ad9679
2021-03-02 02:23:06 +00:00
TreeHugger Robot
2daa747de7 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: Id10872fe92a4393336da081c5d170932e2f94ac1
2021-03-02 02:22:27 +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
d8f534576f 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: I484e0a9402d14e213201820b489053d0178551c8
2021-03-01 23:20:07 +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
0d60f4ae0a 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: I5f84227011e263c6cf381bfde37c545b8e719ae2
2021-03-01 10:35:47 +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
12e47fcfae [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: I752000e9c31d017a8cfed810134a5852121f9c41
2021-02-28 00:56:48 +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
Julia Reynolds
c18b417681 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: I0b228ebe74453e0f0de603abcd72b6fcd2c73851
2021-02-27 15:54:00 +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
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
63d5e9a5a4 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: I4c30c5a01c1e6f02938e9972f6d1f42bb55819cc
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
de55bc92d3 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: I178b2b8f9198c7dddee200b75830ad5c94e0da4f
2021-02-26 17:00:10 +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
9686ac8685 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: I57f789bbeb3bfd310611df41ca65f85bf73f786d
2021-02-26 06:03:48 +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
f2f318f18d [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: Id5e73600ab2dc3bd9c0c99b03f22f012c1160614
2021-02-26 02:44:34 +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
c0b3bfb286 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: I3735572be27b93e00691de662f0b9e44ba5fe29b
2021-02-25 21:00:00 +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
f556b0b1cd 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: I14d475ef01e3697b96b40da9ee189779da12311e
2021-02-25 17:20:55 +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
7e050923f1 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: Iff978ed14dd30503261ea93620e2ef7646e2d1cf
2021-02-25 14:47:37 +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
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
66ddd40687 [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: Ibbdead75a5ae52eec268d6275c2964a8e6f00a6e
2021-02-25 11:03:42 +00:00
Paul Hu
8af9ea6bf1 [automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856 am: 155d4d6cd3 -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: Icdd83bd4c20e65149fd09e7364cb8f7f37946dd5
2021-02-25 10:22:12 +00:00
Paul Hu
155d4d6cd3 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cd486a47be45f68ad7b0db82dcb030a62edb0da
2021-02-25 09:37:00 +00:00
Mill Chen
1e607904c3 Update UI for factory reset flow
After applying a collapsing toolbar in the Settings app, the factory
reset screen is not displayed correctly. This is because
1) the factory reset page should not essentially have a toolbar since it
has different UI layout form other pages.
2) this page was launched previously as a SubSettings so it applied a
wrong theme.

This change is mainly updating the inheritence structure and specifying
the right theme for the factory reset page in order to have a correct
layout.

Bug: 179457252
Test: robotests and visual verified
Change-Id: I91aec65a120d5a288507d89ace7c9298acdca42b
2021-02-25 16:32:50 +08:00
TreeHugger Robot
06d7a4a13d Merge "[Provider Model] Remove the footer of WFC" into sc-dev am: 18eeaad6e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13694190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03850c15c2765037205c7165ba493c40814f6b17
2021-02-25 08:20:02 +00:00
Paul Hu
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
2021-02-25 08:19:44 +00:00
TreeHugger Robot
18eeaad6e3 Merge "[Provider Model] Remove the footer of WFC" into sc-dev 2021-02-25 08:01:24 +00:00
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00
Hugh Chen
848ce26373 Fix talkback will speak "disabled" when select empty preference
Set empty preference as not selectable to make talkback
not to detect it.

Bug: 178068585
Bug: 178067426
Test: manually test
Change-Id: Id293a61494cd0bdd79d104918502101cb5caf050
2021-02-25 15:17:06 +08:00
Zoey Chen
fec2fce744 [Provider Model] Remove the footer of WFC
Reason: Cannot pass the GAR, so UX decides to remove it
https://screenshot.googleplex.com/3Ktq9EBxqUhWivj.png

Bug: 180670301
Test: make
Change-Id: I56d84a45826e14e6cc9093553f1bcfd9c54f70ec
2021-02-25 06:26:49 +00:00