Evan Laird
39c4d8b827
Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
Add setting for showing the vibrate icon in status bar
2022-03-01 16:19:47 +00:00
Xiao Ma
397b3fe978
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
2022-02-24 05:22:10 +00:00
Xiao Ma
db7d7de3b4
Adapt new EthernetManager APIs in Settings.
...
EthernetManager is going to be moved to Connectivity mainline module and
new EthernetManager management APIs have been exposed. This CL adapts
new APIs in the settings in advance, the changes include:
1. use addInterfaceStateListener and removeInterfaceStateListener.
2. rely on the onInterfaceStateChanged callback to receive the Ethernet
interface state update, to replace the getAvailableInterfaces and
getConfiguration.
3. after the Ethernet mainline migration completes, Settings cannot
access the platform resource such as config_ethernet_iface_regex,
instead, check the availability of Ethernet interface by checking
if either any of FEATURE_ETHERNET and FEATURE_USB_HOST is supported.
Bug: 210586283
Bug: 218798003
Test: m
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<modified test cases>
EthernetTetherPreferenceControllerTest
AllInOneTetherSettingsTest
Change-Id: I9e10481e1751975772a24db29568aa26bb85cd70
2022-02-24 01:49:57 +00:00
Presubmit Automerger Backend
0b843be422
[automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Bug: 220144337
Change-Id: If4e3bf2b07f7d5ce4121866a2d7cd26d91fb4a82
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
2022-02-23 15:43:46 +00:00
Evan Laird
16148d2c8c
Add setting for showing the vibrate icon in status bar
...
Test: manual
Bug: 220144337
Change-Id: I2d389d71dd9402353b058039464495a1d33ef0e9
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
2022-02-23 15:43:37 +00:00
Treehugger Robot
f5246d8a8c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033 am: df16e4b74c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: Ib92a9c70e554ff53f452cae5cf45d6be511da39b
2022-02-16 13:33:21 +00:00
Treehugger Robot
df16e4b74c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: I180666f8edc9fdb69fcdec20b9ae2730240ff923
2022-02-16 13:08:35 +00:00
Treehugger Robot
8109ad8033
Merge "Restart the MTP connection when changing transcode enabled"
2022-02-16 09:58:58 +00:00
Treehugger Robot
b99cd8f159
Merge "Show identity address in the bluetooth details page" am: 5d17cfd938 am: 3ac72d1fd6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171
Change-Id: I65bec3e2b43dff86f6bc69f52bfba4abcdcce6fb
2022-02-15 06:31:19 +00:00
Treehugger Robot
3ac72d1fd6
Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171
Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
2022-02-15 06:13:57 +00:00
Treehugger Robot
5d17cfd938
Merge "Show identity address in the bluetooth details page"
2022-02-15 05:07:42 +00:00
Treehugger Robot
a3102c477f
Merge "Fix dream settings OWNERS path" am: c6bf492db4 am: 58fb784e7d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346
Change-Id: I99530d86b8e1372034bf3f1edaf65c7c809dbb15
2022-02-15 00:55:50 +00:00
Treehugger Robot
58fb784e7d
Merge "Fix dream settings OWNERS path" am: c6bf492db4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346
Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
2022-02-15 00:42:12 +00:00
Xin Li
da7237b2ed
Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master
2022-02-14 17:30:11 +00:00
Lucas Silva
55ce0f7cdd
Fix dream settings OWNERS path
...
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
2022-02-14 17:02:16 +00:00
Treehugger Robot
b7077ab55f
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c am: 1a16975a36
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698
Change-Id: I0196d39d1e8d619a54931492fc89f15b8b5dfc99
2022-02-14 11:49:04 +00:00
Treehugger Robot
1a16975a36
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698
Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d
2022-02-14 11:27:00 +00:00
Treehugger Robot
57238d653c
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT"
2022-02-14 10:50:17 +00:00
Treehugger Robot
a93434b11e
Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855
Change-Id: I38ae0b28716a446c9d30a3fbcf7517d0c74e3d30
2022-02-12 12:35:48 +00:00
William Escande
fe155f50fc
Use allowed system value am: 088a7b87f2 am: f859d0f15d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: If7fd42b0a7c006635073a3704ec0af1ac68ada55
2022-02-12 12:35:43 +00:00
Treehugger Robot
43b7ae19fb
Merge changes Idadf8487,I84d87024 am: e489d46b7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855
Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
2022-02-12 12:21:09 +00:00
William Escande
f859d0f15d
Use allowed system value am: 088a7b87f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
2022-02-12 12:21:08 +00:00
William Escande
6de80163b1
Resolve bluetooth hidden API usages
...
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
Merged-In: Idadf84873c88155382c48bb9108cf28d88aaef0a
2022-02-11 14:19:38 +01:00
William Escande
088a7b87f2
Use allowed system value
...
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
2022-02-11 13:05:33 +01:00
Xin Li
b9e9ca119c
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
...
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
2022-02-11 07:29:32 +00:00
Julia Reynolds
445aa53ddc
Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c am: 809c15fd53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: I4f8ce83fea5cde2ddf4517c78e5f66bae461a1ea
2022-02-10 14:38:05 +00:00
Julia Reynolds
809c15fd53
Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: Id88fd287953b4190d4830d0037d9f0817e6a715b
2022-02-10 14:22:43 +00:00
Julia Reynolds
e2d790725c
Merge "Update notification settings OWNERS" am: 49b9583ea1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: I3bdeaab21beed6c214d28516b9699a20c5b09dd5
2022-02-10 14:04:25 +00:00
Julia Reynolds
49b9583ea1
Merge "Update notification settings OWNERS"
2022-02-10 13:48:25 +00:00
Tom Hsu
d1040f8fe9
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95 am: 3639f8c59a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I4db5ebcc51cef0ad63ce03b0d3d137515c6fa8a5
2022-02-10 10:32:35 +00:00
Tom Hsu
3639f8c59a
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I137701d26151296a0ef8e7401a1cfc3334952230
2022-02-10 10:06:56 +00:00
Tom Hsu
f9355dcc95
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I35dceb538404edcbe552b87c6c615c0c8d16c69b
2022-02-10 09:52:36 +00:00
tom hsu
085e5fc946
Add a OWNER file for per-app language
...
Change-Id: I5b0d9491db1f1ba602306289d6df2e4282c2bece
2022-02-10 15:27:09 +08:00
Jack Yu
c7b568751e
Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT
...
Use Intent.EXTRA_USER to pass the UserHandle as the extra field of
ACTION_CHANGE_DEFAULT.
Bug: 215300017
Test: manual
Change-Id: I8862ae509638c7c264f49c4bc5753a65e8fdcfbc
2022-02-09 21:34:59 +08:00
Treehugger Robot
46fc8079dd
Merge "DO NOT MERGE Fix of crash when error messages are triggered"
2022-02-08 20:39:45 +00:00
Treehugger Robot
c45b4ab9ae
Merge "Merge SQ1A.220205.002"
2022-02-08 18:52:08 +00:00
Chienyuan
84a9b23ba8
Show identity address in the bluetooth details page
...
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
2022-02-08 11:29:03 +00:00
Treehugger Robot
3210089fc6
Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: I9f8bb883a0fa1d902144fbf1f4aba9f03f623728
2022-02-08 09:52:04 +00:00
Treehugger Robot
17e8159641
Merge "Settings: Fix FC when learn more textview help intent is NULL"
2022-02-08 09:15:53 +00:00
Xin Li
3160c1adb3
Merge SQ1A.220205.002
...
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
2022-02-07 23:19:53 -08:00
Etienne Ruffieux
b97acda5cf
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: Idc59b3f953adab7686e532d36c66b12d21df995c
2022-02-07 22:00:46 +00:00
Etienne Ruffieux
28b1a9e4b0
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: I22908770a17e3cd3b3fe46c3192511d2f70d4fbd
2022-02-07 21:49:08 +00:00
Etienne Ruffieux
a6d4788fa0
Merge "Removed mocked BluetoothAdapter"
2022-02-07 21:17:41 +00:00
pingzhi wang
d565d8679f
DO NOT MERGE Fix of crash when error messages are triggered
...
Issue is caused by call FragmentTransaction.commit after
activity saved it's state, then IllegalStateException will be thrown
and Settings will crash.
Bug: 216492911
Test: Manual. First boot up the device and follow the wizard till the
point when register the fingerprint. While adding the fingerprint,
short press the power button and turn off the screen.
Change-Id: I96244fc26d2aa8639538f967d645a6ca4fc7c0ba
Merged-In: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-02-04 23:38:47 +00:00
Etienne Ruffieux
e89d54c739
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d am: 89b43fde97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: I666780f68471ba1235adc4a2f60e3a50ae5a868c
2022-02-03 00:36:45 +00:00
Etienne Ruffieux
89b43fde97
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: I76c8884f7a3dc56403e1b3616eff79baee67cc7f
2022-02-03 00:18:40 +00:00
Etienne Ruffieux
9692c59d3a
Replacing getActiveDevice by btAdapter.getActiveDevices()
...
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.
Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
2022-02-02 15:29:34 +00:00
Jack Yu
29e46bd01e
Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80 am: 147f4bc01d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ibb578e5efdfffa772c785cb482de853a19faf0b7
2022-01-28 23:29:42 +00:00
Jack Yu
147f4bc01d
Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ib69851dd1d88fcba84af0cf940b6f949aab15355
2022-01-28 23:14:00 +00:00