PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,177 Commits 1 Branch 0 Tags
dbe73f6603c46f71afba91c3d493e09bae0510c6
Commit Graph

117177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
11b74c81fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4782603e13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60a0830bb1cfc8caff841c19105202bdfd83c602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:10:30 +00:00
Bill Yi
d67c9cae5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6f153936fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d918b4a236691ef4e3aafd344fcdcf38222def4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:10:16 +00:00
Bill Yi
436cfce33f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c959a23a41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45dbc6d0a51e14394f8a1cd8651c9412e73900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:10:01 +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
Bill Yi
1fa98709be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-01 14:40:15 +00:00
Bill Yi
6f153936fd Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-01 14:40:15 +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
10d4535e2b [automerger skipped] [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0 am: 67dc170d66 -s ours 
am skip reason: Merged-In I262327cc49c3a4434a183eb00ac57f47fa598f70 with SHA-1 31eec49217 is already in history

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

Change-Id: I3834777b3e02f539f7cd078d92c9cbe4d08e75bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 03:26:46 +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
d2569ff16b [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp am: 525529c137 -s ours 
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b is already in history

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

Change-Id: I6fe8b0179a7432ef93af9f48fe4ee7758559dbee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:56 +00:00
Bonian Chen
5cb0b4b8f4 [automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: 2b048b22f0 -s ours 
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b is already in history

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

Change-Id: Ic2fc1dda8cba05e7da18519883bd0af0c3e24b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:55 +00:00
Bonian Chen
6e5d5f05db [automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp am: e3b5bda8aa -s ours 
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284 is already in history

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

Change-Id: Ifa6481c3debe82a9e3482fc6373276cc9f184437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:53 +00:00
Bonian Chen
90b7ff7df2 [automerger skipped] [Settings] configuration for hidding SIM notification UI am: 02e4807229 -s ours 
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284 is already in history

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

Change-Id: Ifb7b079e1ab1bc57d784868d4199d9a51bf7fbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:52 +00:00
Bonian Chen
5382450ebe [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp am: f192a07988 -s ours 
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c is already in history

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

Change-Id: If11e77224cc97a0ed613e7b2be677fe8ca6c05df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:50 +00:00
Bonian Chen
79a29e9f3e [automerger skipped] [Settings][Back port] configuration for hidding SIM remove UI am: f6114d3f83 -s ours 
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c is already in history

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

Change-Id: I25c41e551b303ca514b0888a0a0699ada4346d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:49 +00:00
Bonian Chen
7f8204647a [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp am: c5bd2f425b -s ours 
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9 is already in history

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

Change-Id: Ibe612d82b030b1d142568dd4e0724d8e0a8bd96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:47 +00:00
Bonian Chen
aba72c0814 [automerger skipped] [Settings][Back port] configuration for hidding SIM settings UI am: b4a8672dd9 -s ours 
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9 is already in history

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

Change-Id: I06f60f2622f473c00d32946a298258f0fdf2dfa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:46 +00:00
Bonian Chen
6124464d58 [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp am: 4c06b549bf -s ours 
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11 is already in history

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

Change-Id: I17fa1fca8a8fcc121cf2d4cc6a222b1f969f8a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:44 +00:00
Bonian Chen
b1cd705f5d [automerger skipped] [Settings][Back port] configuration for hidding SIM lock UI am: 0466417c76 -s ours 
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11 is already in history

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

Change-Id: Ia4449eda9e6c30d19bbad240c617ea575ab9d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:43 +00:00
Bonian Chen
f5f55e21a0 [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp am: a81f71ae46 -s ours 
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0 is already in history

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

Change-Id: I8d63ec792086c5c10a9b223fca2d7311ba46c7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:39 +00:00
Bonian Chen
97de5d4beb [automerger skipped] [Settings][Back port] configuration for hidding SIM provider UI am: 95dc65667e -s ours 
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0 is already in history

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

Change-Id: I7754e1b8dd88c972a79f3a3f3a342790fd7f96ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:00:33 +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