Commit Graph

15196 Commits

Author SHA1 Message Date
Jordan Jozwiak
84fff1384d Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14 am: 8df6b505af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: I9453a12a4bfe6e79e3a19a7371bba7ab03215a39
2021-08-18 01:12:01 +00:00
Jordan Jozwiak
8df6b505af Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: Ie4805efe824392507eff9ef70c1ee8281491f422
2021-08-17 21:51:12 +00:00
Jordan Jozwiak
5da0ca8a14 Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev 2021-08-17 21:40:30 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00
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
Weng Su
1fe8220afa Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-17 08:14:55 +00:00
ykhung
0791d77df0 [QPR1] 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
Merged-In: I5b35b0fa808eb8a5f607962ee973c2896529b078
2021-08-17 06:09:56 +00:00
Curtis Belmonte
4f1672ce7b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
2021-08-17 01:15:50 +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
36a42b630b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +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
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +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
Jordan Jozwiak
e6835713b6 Use refactored RecentAppOpsAccess
Use the new class in place of the old one.

Bug: 182202223
Test: atest RecentLocationAccessPreferenceControllerTest
Change-Id: If0222e79bf8ba2ebe2b1b0a8c043ce39f5a45596
2021-08-16 13:08:47 -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
e9f836a004 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: Ic64df3fc905575608ec561ba9e8d2efb93fe0b7c
2021-08-14 07:26:54 +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
Zoey Chen
6ce608787b [Provider Model] Redirect Settings Internet panel request to SystemUI.
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI

Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
(cherry picked from commit ab8a922f77)
Merged-In: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
2021-08-13 14:07:01 +00:00
Tsung-Mao Fang
74b1a46cb1 Move Automatic System Updates from Developer Options to System
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.

Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
2021-08-13 08:11:22 +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
f1772f686b 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: Id581e29e3b2ec42a93846d1878caf9bee334fa3b
2021-08-13 04:27:15 +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
725619f6a0 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I9531bd1ac329830db723ffbd28625592702c4a11
2021-08-13 01:21:35 +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
Guojing Yuan
11655705db Remove CDM entries in Connected Device.
BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
2021-08-06 23:24:24 +00:00