Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,161 Commits 1 Branch 0 Tags
eda172ce2c658b4ecee50d9b6e03defd3f03aaf6
Commit Graph

45547 Commits

Author SHA1 Message Date
Wesley Wang
eda172ce2c Fix app battery usage list launch incorrect works app 
- App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
 2022-11-03 11:32:30 +00:00
Joshua Mccloskey
1cda0a8418 Merge "Revert^2 "Implement SFPS “require screen on to auth”"" 2022-11-02 14:33:18 +00:00
Arc Wang
9f10021cd2 Merge "Remove Intent selector from 2-pane deep link Intent" 2022-11-02 12:13:36 +00:00
TreeHugger Robot
f1aa26be3d Merge "App language migration" 2022-11-02 10:17:03 +00:00
Arc Wang
12d4b78473 Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5 am: 4cfe8b8204 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665

Change-Id: I7a3bdcfa520fe402da940e426a89b3ffd2c2b1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 08:41:11 +00:00
Arc Wang
e9fe1b848d Merge "Fix Storage Settings summary jank" 2022-11-02 08:18:33 +00:00
Arc Wang
4cfe8b8204 Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665

Change-Id: I2f7807561257dc18be802f0acc90cce56ca71b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 08:07:13 +00:00
Arc Wang
3b1587d6b2 Remove Intent selector from 2-pane deep link Intent 
To guard against the arbitrary Intent injection through Selector.

Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
 2022-11-02 07:37:45 +00:00
Arc Wang
049deec9b5 Merge "Extend SearchView width" into tm-qpr-dev 2022-11-02 07:22:13 +00:00
Mill Chen
0ee710cddd App language migration 
Implement current app language page using spa arch.

Bug: 236346018
Test: manual test with Settings app

Change-Id: I3d3c97304a381acec9d9ef0c27bd047a40ffc4a8
 2022-11-02 13:29:15 +08:00
TreeHugger Robot
8b23aa2c16 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb am: 34471a7160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: I27396019f31117f69f9088174ed52c6ce3526556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:35:02 +00:00
TreeHugger Robot
34471a7160 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: Id9e378514d71beef1a4dcb9ab0c96053dabe254f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:03:28 +00:00
TreeHugger Robot
d2635580fb Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev 2022-11-01 23:21:35 +00:00
Joshua Mccloskey
73bf45ee4b Revert^2 "Implement SFPS “require screen on to auth”" 
e62d37bad6

Change-Id: Ia44604b059c4847c40608419b2e16219976ced3e
 2022-11-01 16:45:31 +00:00
Gil Cukierman
a69fc1784c Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9 am: 58d85e3383 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: Ieb4b28cde2ec4b747ac55e57f4908c1cbf4ce340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:38:21 +00:00
Gil Cukierman
58d85e3383 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I5b61fd4c84e9ea881f786355c9649bd744d46ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:02:30 +00:00
Gil Cukierman
27217b87a9 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I17e4dc0b5dfdfd55a866b641af560b4dccba1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 14:21:52 +00:00
Gil Cukierman
08d03390ae Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" 2022-11-01 13:51:58 +00:00
Michał Brzeziński
8205d3d591 Merge "Revert "Implement SFPS “require screen on to auth”"" 2022-11-01 13:36:11 +00:00
Michał Brzeziński
e62d37bad6 Revert "Implement SFPS “require screen on to auth”" 
Revert submission 20298870-cherrypick-require-screen-on-to-auth-bx2kw8azs3

Reason for revert: broken KeyguardUpdateMonitorTest
Bug: 256762678
Reverted Changes:
Id58879642:Implement SFPS “require screen on to auth”
Ibc55dfa66:Implement SFPS “require screen on to auth”

Change-Id: I772f6a1b3fa366bc10b200f365df79417eceb8ef
 2022-11-01 11:28:30 +00:00
Arc Wang
0243771025 Extend SearchView width 
To align SearchView x button with right border.

Bug: 254403811
Test: manual,
      Settings > Apps > See all apps > tap the search icon >
      input something and observe.
Change-Id: I5146c9ffb3c5177926e75f673497408092f6c065
 2022-11-01 10:26:17 +00:00
Angela Wang
bd25f4a303 Merge "Fix should not let users adjust a11y button settings in SuW issue" 2022-11-01 09:25:46 +00:00
Kuan Wang
628f12c1ad Remove isChartGraphEnabled() which should always return true after 
migration.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I0c4a6e00a7a9fd66d4050e5ddcf87176462067cd
 2022-11-01 07:58:57 +00:00
Kuan Wang
a79edc3b56 Merge "Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge with the new functions in DatabaseUtils." 2022-11-01 07:11:04 +00:00
Angela Wang
c4f3295491 Fix should not let users adjust a11y button settings in SuW issue 
Root Cause: Users should not be able to adjust any settings of the a11y
button in the setup wizard flow, but there will be a link button to
a11y button settings page on the a11y tutorial dialog where user can
modify the settings.

Solution: Hide the link button in a11y tutorial dialog if we know the
dialog is launched from any setup wizard page.

Bug: 256084341
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I742f9b7ba311fcd7a5105463709dc104345b9f12
 2022-11-01 07:07:47 +00:00
Kuan Wang
45be6bae05 Listen ACTION_BATTERY_LEVEL_CHANGED in Settings and fetch usage data 
when battery is full charged.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ie83e5f319074ff404a600c4eb375fbecad651b6d
 2022-11-01 06:39:21 +00:00
Chaohui Wang
7ef1fb7ef5 Merge "Add InteractAcrossProfilesDetailsPreference for Spa" 2022-11-01 06:08:17 +00:00
Joshua Mccloskey
087a7d29f4 Merge "Implement SFPS “require screen on to auth”" 2022-11-01 04:55:05 +00:00
Arc Wang
67dc170d66 [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891

Change-Id: I0ed23ce19ce4dca5308ecae20e891f4476738258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 02:54:36 +00:00
Kuan Wang
c5c87b7774 Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge 
with the new functions in DatabaseUtils.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I5f60cef80d1e9ba3f87ab6f84492463152a40276
 2022-11-01 02:06:57 +00:00
Kuan Wang
df05a1378b Add hourly period job to fetch battery usage data in Settings. 
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I342066a30fed202e5013b8c2554f36d991975c3e
 2022-11-01 02:05:14 +00:00
Treehugger Robot
9040efdccc Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528 am: 778ef161bb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I1f3cbce7d5de6e63477bc2da2ad115ec53b06472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 00:02:10 +00:00
Treehugger Robot
778ef161bb Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I369fd8dc4e2cec46ffd4e61a32e7e55cb11b41a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 23:24:11 +00:00
Treehugger Robot
7094507528 Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I65ce6c4fdedd32ff6feb4b5e210b508aafc4e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 22:57:02 +00:00
Treehugger Robot
5744d7c560 Merge "Fix errorprone warnings that should be errors" 2022-10-31 22:21:12 +00:00
TreeHugger Robot
425b87090f Merge "Request hiding IME before starting next activity transition" 2022-10-31 20:30:58 +00:00
Kweku Adams
39c9441bea Merge "Allow modifying minimum consumption limit." 2022-10-31 18:54:23 +00:00
Bonian Chen
525529c137 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
e3b5bda8aa Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
f192a07988 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
c5bd2f425b Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
4c06b549bf Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
a81f71ae46 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
YK Hung
c91d3fa880 Merge "Add Zaiyue and I as the owners of battery usage." 2022-10-31 14:49:02 +00:00
Kweku Adams
f6f9a4b7b2 Allow modifying minimum consumption limit. 
Create separate fields for minimum and initial consumption limits so
that they can be modified independently.

Bug: 255321890
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: manually change in Developer Options UI
Change-Id: I82c146a18b54a18313de590038f2f807a2310aa0
 2022-10-31 14:20:58 +00:00
Arc Wang
9e207bfcd0 [Activity embedding] Fix unexpected finished 2nd layer problem 
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.

This change resets SplitPairRule in onNewIntent().

Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
      manual
      1. Settings app -> 'Connexted device'.
      2. Launch Settings app again from Settings icon in quick Settings.
      3. Start a 3rd layer from 'Network & internet'
      4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
Merged-In: I262327cc49c3a4434a183eb00ac57f47fa598f70
 2022-10-31 21:33:02 +08:00
Bonian Chen
bda2f43f7b Merge "[Settings] Adjust the finish procedure when launching Settings UI" 2022-10-31 11:38:25 +00:00
Chaohui Wang
49b7ebeb23 Add InteractAcrossProfilesDetailsPreference for Spa 
To try:
1. adb shell am start -n com.android.settings/.spa.SpaActivity
2. Go to Apps -> All apps -> [One App] -> Connected work & personal apps

Bug: 236346018
Test: Unit test & Manual with Settings App
Change-Id: I4145ffdb46da6e0c4b7b5103207e7b75a8bbfb6a
 2022-10-31 19:25:48 +08:00
TreeHugger Robot
7ced3c187d Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2 am: dada288047 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766

Change-Id: Ie4bec451717442032411cad912810cbfd7a69baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 11:24:47 +00:00
Chaohui Wang
1e45e38c02 Merge "Add AppAllServicesPreference for Spa" 2022-10-31 11:18:43 +00:00