Commit Graph

8568 Commits

Author SHA1 Message Date
Wesley.CW Wang
e0429fdeea Add Battery Defender strings to Settings am: 6117acedb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053209

Change-Id: I3077301357b48298cf018c23ec4b738808c3deea
2020-11-19 06:55:03 +00:00
Wesley.CW Wang
6117acedb0 Add Battery Defender strings to Settings
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: I44f669879a4cb141d3107f77c6a78a1a4406e37c
2020-11-19 06:43:06 +00:00
Yi-yo Chiang
d69b381ab1 Revert "Update the summary of AoD when Bedtime mode is on" am: cd4a35de8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13082204

Change-Id: Ief1b70558800858ac67c0857e562740ae5d42142
2020-11-19 05:22:14 +00:00
Yi-yo Chiang
cd4a35de8e Revert "Update the summary of AoD when Bedtime mode is on"
Revert "Update the summary of Idle lock screen when Bedtime mode..."

Revert submission 13071396-cherrypick-cherrypick-bedtime-hpxwlbiuim-0q85x8kaar

Reason for revert: Broken test b/173663404

Reverted Changes:
Id2511cb0a:Update the summary of AoD when Bedtime mode is on
I041599b9c:Update the summary of Idle lock screen when Bedtim...

Bug: 173663404
Change-Id: I9bea7499393d3ab1733b82140942499dddd9a2aa
Merged-In: I3b7053ad752f548f421dcca10cc1203500b1220b
2020-11-19 04:32:44 +00:00
Edgar Wang
5cbd47e127 Update the summary of AoD when Bedtime mode is on am: bca70dd22d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13071396

Change-Id: Iec1aab3948340fe7870a5960c6f0ddb4536c6c93
2020-11-18 21:27:46 +00:00
Edgar Wang
bca70dd22d Update the summary of AoD when Bedtime mode is on
Since Bedtime mode can suppress AoD, after reviewed by UX, we decide
update the summary to "Unavailable because Bedtime mode is on" when AoD
is suppressed by Bedtime mode.

Bug: 168790245
Test: manual & robotest
Change-Id: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
Merged-In: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
2020-11-18 14:22:11 +00:00
TreeHugger Robot
49b24ac3fb Merge "Update related UI if battery is not present" into rvc-qpr-dev am: 03f15baeef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12999576

Change-Id: I974e064265986265d0984e8c6e4b4db4314bbdf4
2020-11-18 04:01:04 +00:00
Mill Chen
5a347494d2 Update related UI if battery is not present
This change is to update the related UI in the battery page if the
battery is not present. This includes the following updates:
1. Update the summary of battery tile in the Settings homepage
2. Replace the battery level with "Unknown"
3. Replace the summary with help message in the battery page
4. Remove the battery meter icon

Bug: 171368508
Test: verify on an issue device
Change-Id: I892e0d137143160a0bce0c11ce9265120ebb8fd4
Merged-In: I892e0d137143160a0bce0c11ce9265120ebb8fd4
2020-11-06 17:36:27 +08:00
Andrei-Valentin Onea
c3839f4732 Merge "Fix app compat dashboard from settings app" am: 4445b40a65 am: 770e30b1f9 am: 8879952967
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502

Change-Id: Ie87c9ff8ae1e76bb667f7201e6314ec995d2e133
2020-11-02 16:06:44 +00:00
Andrei-Valentin Onea
8879952967 Merge "Fix app compat dashboard from settings app" am: 4445b40a65 am: 770e30b1f9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502

Change-Id: I947653ab33790724f2a419297c3fd7649ef4f2fb
2020-11-02 15:37:28 +00:00
Andrei Onea
b0a6dd680e Fix app compat dashboard from settings app
Fix an issue due to recent changes tha made the settings app
accidentally categorize non sdk gated changes as targetSdk > -1.

The recent changes made target sdk changes have a '>=' condition instead
of strictly '>', so address that issue as well.

Bug: 172043600
Test: open App Compatibility Changes option in Developer Options
Change-Id: Ic5ee203c5a82ac982164304e3ae399947a39e058
2020-10-30 16:38:08 +00:00
Xin Li
8656492241 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Beth Thibodeau
51499b2f51 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I4019b79c2ee725d518ff9c7b6714bda772133d47
2020-09-17 19:12:14 +00:00
Beth Thibodeau
7ca988cab1 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev 2020-09-17 17:56:29 +00:00
Beth Thibodeau
70920bd9ff [DO NOT MERGE] Revert "Allow user to block individual apps from resuming."
Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: Ieacef217587476532246b466d680219351bc1657
2020-09-17 17:55:56 +00:00
TreeHugger Robot
2dfac98e04 Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392571

Change-Id: Idc4c231882c8868bf6970f19f5bc73b391302ef1
2020-09-15 08:40:43 +00:00
Hugh Chen
30a97a9cc5 Display "see all" option when bluetooth is off
- This CL before, Bluetooth settings will hide the "see all"
  option when bluetooth is off. For the UX improvement, this
  CL will show the "see all" button when bluetooth is off. And
  turn on the BT when user press "see all" button to let user to
  quick pair their disconnected devices.
- Update and add test case

Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
Merged-In: I7a1451a36a31253b6be2203341bea4e59fed7c2b
(cherry picked from commit bde100849e)
2020-09-07 02:58:39 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
d57b551b8d Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae am: 08e3e22ae0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4d22338c155adcb13a916d9a689685eb3caad04b
2020-09-01 05:46:53 +00:00
SongFerng Wang
08e3e22ae0 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I2852e9c06cedb61338e6ccaaed078fc07e241a61
2020-09-01 05:00:04 +00:00
SongFerng Wang
4e657741ae Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
2020-09-01 04:40:24 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
2020-08-28 23:35:54 -07:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
2020-08-27 15:56:13 -07:00
TreeHugger Robot
6a23ee5d37 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062

Change-Id: Ib275c7ce10f274d815a155cf9d95af03757e1a7c
2020-08-24 16:05:10 +00:00
TreeHugger Robot
b75d2f6009 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev 2020-08-24 15:47:38 +00:00
Arc Wang
e4ba98cebe Add 'Adaptive connectivity' UI
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.

Bug: 162871294
Test: make RunSettingsRoboTests
      manual
      Switch the toggle button and reboot device, observe
      if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
Merged-In: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 16:44:06 +08:00
Beth Thibodeau
8baf14632c Increase char limit am: 11f8554405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: I58ab443af092a3c96eaeb9ff0d30f6bd1b0fce29
2020-08-19 16:11:30 +00:00
Beth Thibodeau
11f8554405 Increase char limit
More chars needed for translation, and the settings screen that this is
displayed on can already scroll to accomodate extra text.

Fixes: 165029743
Test: manual
Change-Id: Ia7be446901ee6ede7d0ea3b71a4488485de79caf
2020-08-19 14:48:42 +00:00
Beth Thibodeau
ee7da79fbf Allow user to block individual apps from resuming. am: 48ce5892e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268

Change-Id: I131ff7c33871d858a63824fc17ba168ba590f6e2
2020-08-18 14:39:26 +00:00
TreeHugger Robot
ef7b3433a9 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: Ib289fc74a560a02b2d925c8b941c8cc7a04f5d7f
2020-08-17 20:38:28 +00:00
TreeHugger Robot
e87f0d9fa2 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: I13794e6cf89c14ea1ebd5a2751e4590f4b7f4c01
2020-08-17 20:25:53 +00:00
Beth Thibodeau
48ce5892e8 Allow user to block individual apps from resuming.
This adds a new section to the media controls settings screen with a
list of apps that could potentially be used for resumption. If an app is
toggled off it will be added to a list of apps which will not persist in
QS, even when resumption is on.

Also updated the strings on this setting page to match UX
recommendation, so the default toggle state is now on.

Bug: 161813143
Bug: 159852516
Test: manual
Test: atest SettingsProviderTests
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="ResumableMedia"
Change-Id: Id3de52419ffba233469396dd47439428201e5e00
Merged-In: Id3de52419ffba233469396dd47439428201e5e00
2020-08-17 15:47:04 +00:00
Jiashen Wang
8e939b0dfc Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I549082280f8b9a49f75333f9327b92ea679caa61
2020-08-15 13:03:32 +00:00
Jiashen Wang
4d00b8b57a Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I987fd968ff755e88942bd69409b59996a08c972a
2020-08-15 12:53:07 +00:00
Jiashen Wang
e50cda81df Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Id36dbea5606b1775c83b3d6a53880a5f60ab715b
2020-08-15 12:52:55 +00:00
Jiashen Wang
bbcd54dd63 Adding dialogs to warn users about the potential eSIM erase failure
eUICC card could potential in the card error state and all the eSIM
operations will fail which could be fixed by a reboot. Thus, we need to
pop up a dialog to inform users that their eSIM profiles cannot be
erased successfully.

Bug: 163078560
Test: Manually tested by mocking the eUICC card error state.
Mock: https://docs.google.com/presentation/d/1AVNXxPbieTX1KmoewG4mo3xWPnEZyba_h9rPcwHHcr8/edit#slide=id.p

Change-Id: I102fb2de889e08554f525f2cbe1528bb9a37afd7
2020-08-15 05:31:49 +00:00
Yi-Ling Chuang
e50265cb43 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: 631465df31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I72029cb7956edadd3faef36de6b0e81176575985
2020-08-15 02:20:32 +00:00
Yi-Ling Chuang
c248da2974 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I76c77c66be5da635571f876d9b76906f789e8472
2020-08-15 02:08:57 +00:00
Yi-Ling Chuang
631465df31 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Iefb77041715dba0cc2a19210e1353f935e25a8a8
2020-08-15 02:08:53 +00:00
Peiyong Lin
9511d443cb Rename game driver to updatable driver.
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.

Bug: b/164449016
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: I2237dfb22ecd94bc2475249b1460796ac1693d81
2020-08-14 16:29:03 -07:00
Zhen Zhang
c1b516b2c1 Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010

Change-Id: I9d867fcfa8e3af30dfbfdb2a7990950b4443b2e6
2020-08-13 23:45:39 +00:00
Zhen Zhang
75028dd946 Update subtext of Ethernet Tethering preference
Update the subtext summary according to UX

Bug: 153761463
Test: built successfully; manually test
Change-Id: I96d1a1f5111f85ee4b10f61ab4408822b99032e1
2020-08-12 16:13:48 -07:00
Yi-Ling Chuang
228bc78bf9 [DO NOT MERGE] Pre-allocate height for contextual cards.
To prevent the UI jank causing by the async card loads, we pre-allocate
some space for the card to fill in. After this change, only one card can
be shown at a time.

More details:
- When the card number configuration is set to 0, don't trigger the card
loader.
- The height adjusting logic is as follows.
When Settings is opened, pre-allocate a space first.
After the RV finish laying out, reset the RV to wrap_content. So if the
card has to be expanded(eg. wifi large mode or dismissal view), then it
will adjust the height accordingly. While if a card previously shown
becomes unavailable(dismissed or conditions not meet), we also reset the
RV so the space can be gone.

Bug: 163288869
Test: robotest
Change-Id: I0dcb2dae8f0533e562ad06f664b7ae7a9afecd21
2020-08-12 21:40:06 +08:00
TreeHugger Robot
48d768b00c Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I41175eb59b2cea6dfeb97d1413ab6c4846ddb844
2020-08-07 11:49:39 +00:00
TreeHugger Robot
edd587c2a6 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev 2020-08-07 11:37:27 +00:00
Tsung-Mao Fang
d042a9f2d3 The text on toast should be changed when remains 1 time for SIM lock input
The behavior of getQuantityString() is different according to language, it gets both "other" and "one" string if English is system language. But it always gets "other" string if non-English, then the "other" string of wrong_pin_code is shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for remains 1 time.

Test: Rebuild rom
Fix: 71783850
Merged-In: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
Change-Id: I1c069333b19399b727e10ed4a6c9483cc1bc44a6
2020-08-07 06:19:07 +00:00
Bonian Chen
ec42c98e8b Merge "[Settings] Learn more link should be removed when not supported." 2020-08-03 05:25:20 +00:00
Bonian Chen
1c5431bf23 [Settings] WEA title wording change
The wording of WEA need to align in UI entry and UIs within.
The "Wireless Emergency Alerts" should be the official wording for it.

Bug: 158498436
Test: build pass
Merged-In: I17e6659915e1038c8ab11ad4003c08f87bbdb82e
Change-Id: I4c1c4009287092703669f89981fd017ce605d4fe
2020-08-02 21:30:32 +08:00
Bonian Chen
fed54f7dc4 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08:00
Arc Wang
675894883c Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I84f736a1797e9b6b31bc007fc88df912ca9f5eeb
2020-08-01 02:57:49 +00:00