Treehugger Robot
1254e6b856
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
am: e016e0b03f
am: e53111b6a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56db10cad198f321a3146b70f0f760cd71e67afd
2021-08-17 10:01:24 +00:00
Treehugger Robot
e53111b6a0
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
am: e016e0b03f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
2021-08-17 09:48:26 +00:00
Treehugger Robot
e016e0b03f
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Curtis Belmonte
bf54fec03a
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
am: 474fba01f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Icc46cedb2fcd2e7a7bc471a029f2e7c832cecbdc
2021-08-17 01:15:04 +00:00
Curtis Belmonte
474fba01f1
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
2021-08-17 01:01:47 +00:00
Curtis Belmonte
a0847b6130
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod am: 562d29d081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ia95f2c062c6dcdbd40ed5f51bcb7c4fa96dc3f88
2021-08-17 01:01:21 +00:00
Curtis Belmonte
dbef2415d3
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
2021-08-16 21:44:39 +00:00
Curtis Belmonte
5cf728d2fc
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
TreeHugger Robot
80544241db
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: f680c9b0b5
am: 85e6aba27f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
2021-08-14 07:49:54 +00:00
TreeHugger Robot
85e6aba27f
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: f680c9b0b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I22f3bf1a65273f70a59cb59018bc9f44d04552b2
2021-08-14 07:37:41 +00:00
TreeHugger Robot
f680c9b0b5
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
Ayush Sharma
8851afb8ff
Merge "Remove refs of isSeparateProfileChallengeAllowed"
2021-08-13 15:49:11 +00:00
Alfred Lin
7f8e775754
Prototyping : Demo Image on color setting
...
Implement prototyping of demo image on color setting
Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
TreeHugger Robot
03a9dfe57f
Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
am: 597ca951a9
am: fb60c7664f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623
Change-Id: If8185fd1c7cfca44264e3339b87b3cae3fd574e1
2021-08-13 05:53:35 +00:00
TreeHugger Robot
fb60c7664f
Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
am: 597ca951a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623
Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
2021-08-13 05:38:45 +00:00
TreeHugger Robot
597ca951a9
Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623
Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c
Merge "Handle spanned conversation labels" into sc-qpr1-dev
2021-08-13 04:11:04 +00:00
Joe Bolinger
6512f20958
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
am: 36f4314136
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: I5e761d2822d9787ad8d26fd41bc5daf1bad1754e
2021-08-13 02:58:21 +00:00
Joe Bolinger
ba21ddcc35
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
am: 74efeebf5c
am: 0c8e25d2f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: I2628d6122ec21c0ce65b22d6e880adde90dd0dfa
2021-08-13 02:56:11 +00:00
Joe Bolinger
74efeebf5c
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
2021-08-13 01:14:44 +00:00
Joe Bolinger
2296f618cc
Add biometric OWNERS to unit tests.
...
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
2021-08-12 16:17:03 -07:00
Julia Reynolds
2ffbb747d4
Handle spanned conversation labels
...
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
YUKAI HUNG
25a6752ac7
Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c
am: cdc43dfc73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296
Change-Id: I6c7be98e5752bcdfffb00b94333ed052ac2f9f9e
2021-08-12 07:31:13 +00:00
YUKAI HUNG
cdc43dfc73
Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296
Change-Id: I9551360d2c78279677efa94ae6cda28e98e04196
2021-08-12 07:17:48 +00:00
ykhung
fbbcc55fc0
Add time unit into battery usage chart and refine some UI
...
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage
screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K
Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
2021-08-12 03:59:39 +00:00
TreeHugger Robot
5bef3f74f9
Merge "Fix USB tethering is not turned on with a single tap"
2021-08-12 03:52:32 +00:00
Joe Bolinger
9e9f1249d4
Refresh biometric preference controllers on lifecycle events.
...
Fix: 195961101
Test: make RunSettingsRoboTests
Test: manual (enroll via settings and verify preferences enabled after enrolling)
Change-Id: Ie50cd862a42c96eb95f2156a33f34748b2b8b50c
2021-08-10 13:29:05 -07:00
Joe Bolinger
0560b36964
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 0b705abada
am: 8d0ad43149
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: Icdb6dd28c9aebea739928d4cd72fc0723820717d
2021-08-07 00:53:39 +00:00
Joe Bolinger
59f46b4385
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce
2021-08-07 00:39:30 +00:00
Joe Bolinger
087078208c
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 76b51c0d57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I347fa7ed007573a1b83ba84d1ecb3ac48c9d2caf
2021-08-07 00:38:53 +00:00
Joe Bolinger
0b705abada
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I2cebeaef5456520f8d4a40fa20c6c8f469007218
2021-08-07 00:21:37 +00:00
Joe Bolinger
336d3e5501
Merge "Fix extra password confirm prompts during managed setup." into sc-dev
2021-08-07 00:07:22 +00:00
Bonian Chen
ea9c9df826
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: 23f97347a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: I98572de38df258b03c812f82787555f84106df0a
2021-08-06 03:47:15 +00:00
Bonian Chen
23f97347a3
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: Ia86d71fb7b70dc1ff9c6ff4d2b902b09baf736b2
2021-08-06 03:32:23 +00:00
Bonian Chen
a5517006b3
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
2021-08-06 03:31:26 +00:00
Hugh Chen
ba30b04cc3
Fix USB tethering is not turned on with a single tap
...
Before this CL, the USB default settings will set default usb functions
to RNDIS when tethering is started. Because in some devices, the NCM
is used instead of RNDIS to start tethering. If RNDIS is set in the
device that uses NCM to start tethering, it will cause start
tethering failed.
This CL will use the current functions to set default usb functions
to fix this issue.
Bug: 195068679
Test: make -j42 RunSettingsRoboTests
Change-Id: Ic9353c5ac76c0cd517318a4304fa214d6b2201d2
2021-08-06 03:13:17 +00:00
Julia Reynolds
17dda0faec
Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."
2021-08-05 20:34:13 +00:00
Joe Bolinger
c11e01f39d
Fix extra password confirm prompts during managed setup.
...
Managed accounts may set the pin/pattern before enrollment begins.
Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
2021-08-05 11:08:48 -07:00
Bonian Chen
35df60f316
[Settings] eSIM existance detection rule change
...
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.
2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.
Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94
)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
TreeHugger Robot
91321b329a
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: b40dabe916
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I8c6d26177c24f8670db66dd04c52623ab224949d
2021-08-04 07:42:53 +00:00
TreeHugger Robot
c3d193572f
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: 1741a0bd6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I7315ee315f79f8ec724353621aac9b82b3f71837
2021-08-04 07:42:27 +00:00
TreeHugger Robot
b40dabe916
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: Idc444434a9c06cb1890b147c06fa6cf084beb401
2021-08-04 07:30:00 +00:00
TreeHugger Robot
f42a8893c6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
“Ayush
41873bd7a4
Remove refs of isSeparateProfileChallengeAllowed
...
Remove this API usage as this API is being removed from DPMS.
Bug: 189502721
Test: N/A
Change-Id: I395a48cd78c8fb93bfd54c94794de5a680ba6f5d
2021-08-03 21:21:16 +00:00
Bonian Chen
e421a7265d
Merge "[Settings] eSIM existance detection rule change"
2021-08-03 13:12:20 +00:00
Bonian Chen
848d097b94
[Settings] eSIM existance detection rule change
...
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.
2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.
Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
2021-08-03 11:04:27 +00:00
Jason Hsu
05c7ed1d05
Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98
am: 02990f7470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732
Change-Id: I777d6dbba30b3da7308ce998e3aeefbbbd298bba
2021-08-02 06:34:11 +00:00