Commit Graph

100483 Commits

Author SHA1 Message Date
William Escande
51cda9bbf9 [automerger skipped] Use allowed system value am: 088a7b87f2 am: f859d0f15d am: fe155f50fc -s ours
am skip reason: Merged-In I84d87024423869515937ab87381be572fed0ba65 with SHA-1 8ccfd6da23 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: Ib7d75b439112f32ccc8be0f9d96443f74f8a5c20
2022-02-12 12:53:20 +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
Treehugger Robot
e489d46b7c Merge changes Idadf8487,I84d87024
* changes:
  Resolve bluetooth hidden API usages
  Use allowed system value
2022-02-12 12:06:16 +00:00
Peter_Liang
61264d046d Polish and humanize the title for the entry of Text and Reading Options in SuW.
Bug: 219163254
Test: manual test
Change-Id: Ic908918a1b4978dd10e42e13c619bb8d0a697467
2022-02-12 17:38:41 +08:00
Peter_Liang
8f38c46c51 Polish and humanize the title for Text and Reading Options.
Bug: 219163254
Test: manual test
Change-Id: Iefa3ec8455f36338a0bf067b5ae2122afb80b64b
2022-02-12 17:09:56 +08:00
PETER LIANG
87e9c68550 Merge "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (16/n)." 2022-02-12 03:27:06 +00:00
Menghan Li
d920ad507c Merge "Polish humanize strings for Caption preferences page" 2022-02-11 22:10:14 +00:00
Menghan Li
caeccebb5c Merge "Polish humanize strings for Accessibility button & gesture page" 2022-02-11 22:06:52 +00:00
Yuri Ufimtsev
78edc210de Merge "Move all the shared Screen Lock details into a reusable utility class" 2022-02-11 17:06:12 +00:00
SongFerng Wang
acb88fb9f2 Merge "[MEP] the port id is wrong" 2022-02-11 16:40:38 +00:00
Lucas Silva
3eb4cb41ae Move Dream OOBE activity to SettingsGoogle
This will only be used on pixel devices.

Bug: 217555049
Test: locally on device
Change-Id: Ica7cddae8b8b8693a83da95d25a8d0827aed0945
2022-02-11 16:22:54 +00:00
Lucas Silva
7df9d0703a Merge "Implement floating dream preview button." 2022-02-11 15:36:35 +00:00
menghanli
f6040e12bc Polish humanize strings for Caption preferences page
- Add intro for usage
- Update footer description on limitations
- Update the default caption size to medium
- Update the caption size and style dynamically

Bug: 218409087
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=CaptionAppearancePreferenceControllerTest

Change-Id: I6526250894cc6a3fd02e3d8c675280855b307a68
2022-02-11 23:02:57 +08:00
Marie Matheson
cf6ec6a251 Merge "Adds LockScreen SafetySource and SafetySource broadcast receivers." 2022-02-11 14:35:20 +00:00
menghanli
a69d69e01c Polish humanize strings for Accessibility button & gesture page
Bug: 218409088
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest

Change-Id: I9fde58d0a438aae68f0c8457f894e6b06ef97f3b
2022-02-11 22:34:42 +08:00
PETER LIANG
f676ff2b74 Merge changes I502e52f6,Iabf58566,Ida773967,Ic6c48861,If9e5cc6e, ...
* changes:
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (15/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (14/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (13/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (12/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (11/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (10/n).
2022-02-11 13:42:55 +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
Pavel Grafov
f8ba876fbe Merge "Make distinction between null and empty IM list." 2022-02-11 12:13:28 +00:00
William Escande
088a7b87f2 Use allowed system value
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
2022-02-11 13:05:33 +01:00
PETER LIANG
0b44b6061f Merge "Fix NPE of AccessibilityShortcutPreferenceFragmentTest." 2022-02-11 11:56:22 +00:00
PETER LIANG
38801aa1ce Merge "Fix NPE of ToggleAccessibilityServicePreferenceFragmentTest." 2022-02-11 11:56:22 +00:00
PETER LIANG
a12f4571be Merge "Fix NPE of LaunchAccessibilityActivityPreferenceFragmentTest." 2022-02-11 11:56:22 +00:00
Neil Fuller
5f03fad2d3 Switch "UTC time" to "Unix epoch time"
This is more correct. Android devices, even under ideal conditions,
don't track UTC (which contains leap seconds and uses the SI definition
of a second) but use a clock based on Unix epoch time (no leap seconds,
but clocks may skip/stop or smear around leap seconds to ensure a fixed
number of second increments per calendar day when leap seconds are
applied to UTC).

Bug: 218802673
Test: Compile only
Change-Id: I4c5435bdb3bb124d4cb465a966bd43d58b640421
2022-02-11 11:40:08 +00:00
Yuri Ufimtsev
c10c16bb39 Move all the shared Screen Lock details into a reusable utility class
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ChangeScreenLockPreferenceControllerTest
Test: atest SettingsUnitTests:ScreenLockPreferenceDetailsUtilsTest

Bug: 215515298
Change-Id: I46543d35ce4dc2fee85ad1c55886b272de113768
2022-02-11 10:55:16 +00:00
SongFerngWang
28e8f4d65a [MEP] the port id is wrong
The function uses wrong information to get the portId.

Bug: 218907001
Test: manual test.
Change-Id: I70a02299c40ada4c2a700fc035034e8db24b6f03
2022-02-11 15:57:52 +08:00
Peter_Liang
b91f6ee0fb Fix NPE of ToggleAccessibilityServicePreferenceFragmentTest.
ComponentName.unflattenFromString() return null if the string was
incorrect.

Bug: 218975511
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleAccessibilityServicePreferenceFragmentTest
Change-Id: I4384aa60aca657b5dd2ffc3a6fa44b7258bbb5b6
2022-02-11 07:56:19 +00:00
Yi-Ling Chuang
2cb3f925a3 Only set embedding rule for top level injection
Only the injected items on the top level pages should always be opened
on the right pane, so we should only register the split rule for that
part. This will leave flexibilities for those injected items in the
subpages.

Fixes: 216026158
Test: Go to Passwords & accounts > {account} > Google Account and see
the page opened in a full screen/new task.

Change-Id: I9f311547854ace410e93fdb4ca394df1079f723c
2022-02-11 15:34:41 +08:00
Weng Su
05e713bcc5 Merge "wifi data usage: Query wifi usage per configuration" 2022-02-11 07:34:21 +00: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
Peter_Liang
f7c1d39f27 Fix NPE of AccessibilityShortcutPreferenceFragmentTest.
Add the mock FragmentActivity into to avoid NPE.

Bug: 218974847
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityShortcutPreferenceFragmentTest
Change-Id: Ia58484d9b09bd091513da04dff8659ce651acb8d
2022-02-11 15:21:05 +08:00
Peter_Liang
80c649fe3e Fix NPE of LaunchAccessibilityActivityPreferenceFragmentTest.
ComponentName.unflattenFromString() return null if the string was
incorrect.

Bug: 218975513
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=LaunchAccessibilityActivityPreferenceFragmentTest
Change-Id: I21a7bdb14aba6b23e74b9569d0a1a5f74e0f0106
2022-02-11 15:17:09 +08:00
Tsung-Mao Fang
6116391489 Merge "Update OWNERS for dream settings" am: e294a5a1db am: 144f23be39 am: e098415564
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I7067c4ec908d2ccb35445fe8937f1843e4835487
2022-02-11 07:03:40 +00:00
Tsung-Mao Fang
e098415564 Merge "Update OWNERS for dream settings" am: e294a5a1db am: 144f23be39
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I3da1488d455189eb25107e5452040fa86e8d2ae4
2022-02-11 06:47:00 +00:00
Wilson Wu
2683549e29 Merge "Fix NPE if keyboard settings is launched by work apps" 2022-02-11 06:27:41 +00:00
Tsung-Mao Fang
144f23be39 Merge "Update OWNERS for dream settings" am: e294a5a1db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I0eee5bb9c89621f84bc43bc9e8763991b782c292
2022-02-11 06:25:15 +00:00
Tsung-Mao Fang
e294a5a1db Merge "Update OWNERS for dream settings" 2022-02-11 06:12:16 +00:00
Menghan Li
78ba8d0bb4 Merge "Update Accessibility quick setting tooltip strings subtext" 2022-02-11 05:55:06 +00:00
Zoey Chen
2353147905 [Settings] Fix the test fail in robo tests
Bug: 215047192
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: Iea894d989a3f255085cbf280619e28b65553658a
2022-02-11 11:56:32 +08:00
Marie Matheson
e6bb6730aa Merge "Add some functionality to Settings ShadowLockPatternUtils" 2022-02-11 03:15:11 +00:00
Yanting Yang
d8bd19bfbd Merge "Fix broken tests of AppInfoDashboardFragmentTest" 2022-02-11 01:55:13 +00:00
Marie Matheson
39034b66cf Add some functionality to Settings ShadowLockPatternUtils
Test: make RunSettingsRoboTests
Bug: 218885287
Change-Id: If8a28a1680f0fc62f2bff5a927ccf876441bafa5
2022-02-10 23:14:43 +00:00
Qi Cao
68d6c80a12 Merge "Made following changes to Settings:" 2022-02-10 22:52:53 +00:00
Weng Su
0b82d67a04 wifi data usage: Query wifi usage per configuration
- Updated to use the AllNetworkKeys set instead of NetworkId.

- Fix crash issue when mDataUsageController is not created.

- See b/126299427#comment37 for a screenshot.

Bug: 126299427
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiDataUsageSummaryPreferenceControllerTest

Change-Id: I26289fde1f18d97631448edc71e034d33b865cc4
2022-02-11 06:32:04 +08:00
Lucas Silva
12945af711 Implement floating dream preview button.
Bug: 217556080
Test: locally on device
Change-Id: If76dce6a250fc5fc37d26fc3d7a31775333055d7
2022-02-10 20:42:12 +00:00
Lucas Silva
c3f78bce8d Update OWNERS for dream settings
Change-Id: Ie4b483907918986c3b1b4b284ec0f977569cfd58
2022-02-10 19:40:25 +00:00
Derek Jedral
a03b66952e Merge "Fetch active trustagents from LockPatternUtils" 2022-02-10 18:17:44 +00:00
Yanting Yang
2b6746b183 Fix broken tests of AppInfoDashboardFragmentTest
Fixes: 218798403
Test: robotests
Change-Id: Id263259b778c3b12728eb6831afb286e0a2772ae
2022-02-11 00:06:43 +08:00