Commit Graph

59414 Commits

Author SHA1 Message Date
Daniel Hunt
26aaf07e9d Fix NPE in PanelFragment
When updating the panel after getting a second intent to the
activity, there is a small window of opportunity for the user
to close the activity before the animation ends, causing an
NPE when onFinish is called as the activity already closed down.
This change will check that there is an activity before trying
to finish it.

Bug: 150322041
Test:
For an easy way to reproduce this, turn the screen on and run the
following in a terminal:
 while true; do adb shell am start -a \
 android.settings.panel.action.INTERNET_CONNECTIVITY; \
 sleep 0.1; done
Then press the back button while the screen is attempting to
display the fragment. There should be no Settings crash.
Change-Id: I4ca831d71a7221a7a4a62bb29e802f507ce5213c
2020-02-27 15:47:38 +01:00
Automerger Merge Worker
d2750a8d0e Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde
Change-Id: I4f82e4de83cc7982ea791d65dd8a97fc882f13a9
2020-02-27 11:35:52 +00:00
TreeHugger Robot
4e3b62adde Merge "Minor change to cross profile setting subtext." into rvc-dev 2020-02-27 11:17:18 +00:00
Arc Wang
a001e42d7b [Wi-Fi] Fix hint text color contrast problem in 'Add networks'
To raise hint text color, set android:attr/textColorSecondary
to android:textColorHint.

Bug: 146908018
Test: accessibility scanner
Change-Id: Id2525c1a0fc0b3f95298d493e2dc69b91aa13d77
2020-02-27 18:36:20 +08:00
James.cf Lin
64ac0d4a74 [Settings] "Data during calls" in DDS SUB is still in advanced option.
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
2020-02-27 17:52:47 +08:00
Automerger Merge Worker
6af789dbd2 [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: Ia028c322526bcaf784be278b8097767f5019066d
2020-02-27 09:12:29 +00:00
Automerger Merge Worker
9ac493094e Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
2020-02-27 09:02:56 +00:00
Automerger Merge Worker
4a791935a6 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
Change-Id: If2e85409f09d02876a496af93f76a2753e493da9
2020-02-27 08:55:25 +00:00
Treehugger Robot
cd4ca97828 Merge "Fixes ApnEditor not restoring previous UI" 2020-02-27 08:50:37 +00:00
TreeHugger Robot
2f492604e5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev 2020-02-27 08:41:57 +00:00
Arc Wang
9b69fd17bf [Wi-Fi] Fix data usage screen flash 1~2 times problem
Data loaders should be destroyed at onPause or
the APP list will be updated twice.

Bug: 146841747
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Ic1b8ef443dd8e50777f1e3a16977add654748c54
2020-02-27 16:18:04 +08:00
Tim Peng
3405c3dfa9 Change volume panel title from "Volume" to "Sound"
Bug: 150337735
Test: manual
Change-Id: Icc457c2c1aae21282261549de47eeaf9c7219887
2020-02-27 08:11:39 +00:00
timhypeng
95bd75e97b Append status to title for the disconnected Bluetooth device
-Set gray color for status
-Remove status text in subtitle
-Add test cases

Bug: 149176483
Test: make -j42 RunSettingsRoboTests
Change-Id: I5ebb4e080f43d4c0fc00d87a4732ace76c2d806e
2020-02-27 08:10:51 +00:00
Automerger Merge Worker
7cef543f21 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7
Change-Id: I1201bf090cbf65a6aa1584c4078e7fdee11aef68
2020-02-27 07:19:52 +00:00
TreeHugger Robot
c023e758f7 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-02-27 06:57:22 +00:00
Automerger Merge Worker
dbf643c5e9 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
Change-Id: I1b6a7e48fdf94f62cd83899718b8e5c233e7e211
2020-02-27 06:46:33 +00:00
TreeHugger Robot
63105b36a7 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev 2020-02-27 06:42:25 +00:00
Automerger Merge Worker
71f6ccd61a Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943
Change-Id: Ie29d41ddd7387380708acdc0a313f000da280193
2020-02-27 06:40:38 +00:00
Tim Peng
a87985c4ae Add dynamic group panel
-Rename PanelCustomizedButtonCallback to PanelContentCallback
-Add onGroupChanged in PanelContentCallback
-Add test cases

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: I60888efbbd0fc2878467418e55c70887a9d3f405
2020-02-27 06:29:01 +00:00
timhypeng
7dfd41f6b1 Add slice for dynamic grouping in output switcher
-Add group operation slice to edit the group and do the volume adjustment
-Add grouping API in slice worker
-Add test cases

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: Ide0df5e3934bc8ac68aaa67fcbd6173a4454ac7f
2020-02-27 06:28:15 +00:00
timhypeng
0abaafcf28 Add slice regist key for dynamic group
Bug: 146813761
Test: build pass
Change-Id: Id620ec8c465cf5d7e8b1321f3a0d2a638ff6e7ac
2020-02-27 06:27:59 +00:00
Automerger Merge Worker
23d5e32943 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4
Change-Id: I11f38c08c75c835821e92e761750ffb211b3b98e
2020-02-27 06:25:22 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Automerger Merge Worker
3e5efba257 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
Change-Id: Iaed39509cbc4011758e240cdefd2d23a44bdb4c6
2020-02-27 05:38:35 +00:00
TreeHugger Robot
9408533075 Merge "Let footer with learn more become selectable" into rvc-dev 2020-02-27 05:27:26 +00:00
Lee Chou
80d8c3bc83 Fixes ApnEditor not restoring previous UI
ApnEditor tries read and set the UI in onCreate, before the previous
bundle is restored. This caused problems when the configuration has
changed (such as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 12:33:16 +08:00
Lee Chou
c12b1b40ee Fixes ApnEditor not restoring previous UI
ApnEditor tries read and set the UI in onCreate, before the previous bundle
is restored. This caused problems when the configuration has changed (such
as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 11:50:03 +08:00
Automerger Merge Worker
2a428bbe48 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
Change-Id: I1a1a8c59a254fea7267dcf1be555573cf8c7c62a
2020-02-27 03:35:21 +00:00
TreeHugger Robot
d20ca89728 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev 2020-02-27 03:29:20 +00:00
Automerger Merge Worker
02790d5285 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6
Change-Id: I833d625652995ee1d8434935772d825e3a5c1a3d
2020-02-27 03:26:19 +00:00
TreeHugger Robot
640245cda6 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev 2020-02-27 03:15:29 +00:00
Automerger Merge Worker
424965f608 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f
Change-Id: Ie5eb8cbdc00528c59bfa9d972de1149dab40477c
2020-02-27 02:29:23 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
63f67ffb1a Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9
Change-Id: I76cfbbc6147fc441d532f43b53b05d0ffd01e1ba
2020-02-27 01:51:16 +00:00
TreeHugger Robot
e28bd9d6d9 Merge "Increase size of touch target" into rvc-dev 2020-02-27 01:34:28 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Heemin Seog
56e62ec30a Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL
TYPE_STATUS_BAR_PANEL is deprecated and the replacement is in a
different Z layer. SUB_PANEL ensures that the view appears in the same
place as before.

Bug: 10414819
Test: existing robo tests
Change-Id: I16113e5140e753e87e55467230b5b6fbf21deffd
2020-02-26 14:17:11 -08:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
2020-02-26 21:46:38 +00:00
Julia Reynolds
fceea9d0a1 Increase size of touch target
Test: make
Fixes: 146848768
Change-Id: Ib1e5886f5953ed48b2a5b851a696e037124d45eb
2020-02-26 15:15:16 -05:00
kholoud mohamed
8ade7701e1 Minor change to cross profile setting subtext.
Bug: 140728653
Test: N/A
Change-Id: I9f112e19bbd6f0cb6a817797adac3e16abdfa4e0
2020-02-26 17:45:12 +00:00
Automerger Merge Worker
70e242c19c Include changes that happen when history is open am: 8b031276b7
Change-Id: I46e0855230e7f2cd36fbd3f38ec27d0a5f992074
2020-02-26 16:13:36 +00:00
Dan Sandler
f9a8552f74 Support updated rendering of conversation icons.
Note that changes to channel settings now generate
onResume() for all available controllers to ensure they get
the updated drawable.

Bug: 149747760
Change-Id: I3f73c025b1d32194e3d5147d03cb781e370f2a1b
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
2020-02-26 11:09:38 -05:00
jasonwshsu
5c38960848 Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)
* AccessibilityShortcutPreferenceFragment was removed,
ShortcutServicePickerFragment should also removed.

Bug: 142529032
Test: Manual test
Change-Id: I08f96a3794235d308b10f3846f1b4f7bb4306923
2020-02-26 21:17:59 +08:00
Sunny Shao
721f60515d Let footer with learn more become selectable
- Update this attribute after synced with the Switch Access team.

Bug: 149808249
Test: manual test
Change-Id: I8e4fb7738541b4ccbbb5acf643265c78a61f8c45
2020-02-26 13:08:01 +00:00
Julia Reynolds
8b031276b7 Include changes that happen when history is open
Test: manual
Fixes: 150202759
Change-Id: Ic05be6c5c85a16567556d3f3902f4d557a8e7c1f
2020-02-26 12:42:57 +00:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
2020-02-26 18:23:31 +08:00
Automerger Merge Worker
1d63b3f5c6 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
Change-Id: Id570b28ba84f3d7de23fe399044f99d6766f0ede
2020-02-26 04:45:05 +00:00
Julia Reynolds
9f6351b596 Merge "Stop controller from steal preference clicks" into rvc-dev 2020-02-26 04:32:52 +00:00
Automerger Merge Worker
89e1d0d6d2 Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
Change-Id: Ie944bb2163d7db1e642b4f742d4fbf88563e4993
2020-02-26 03:04:06 +00:00