PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,581 Commits 1 Branch 0 Tags
ae3792c3ee0f2ac1836df88665c97690cec7a37d
Commit Graph

114581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Badour
2e005f4cec Remove luyota from OWNERS. 
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
 2022-08-12 19:57:37 +00:00
TreeHugger Robot
ba19ab70fa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-12 19:50:01 +00:00
Automerger Merge Worker
4fec01b98a Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp 2022-08-12 19:43:18 +00:00
Bill Yi
b3eb862b70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I340b51276529f1b25278b1fe728d1b9f96ac40ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:42:11 +00:00
Bill Yi
e001721f49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b4e7ae5ba8cb265e33694cb3c4130019edfff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:42:09 +00:00
Bill Yi
76182fe42d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I499779bbd3cca72249b731b4a0f9572d27bfa3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:42:06 +00:00
Bill Yi
a35159b7b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 2f0a902523 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied69ab54352110e02220244059f473afe7b3d523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:41:48 +00:00
Bill Yi
1d60978515 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd7bb1e1eb6caba9610276ed3660e919c2be94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:06:24 +00:00
Bill Yi
2f0a902523 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic13da209a020e3c6df75b2b4ca47b921932f8c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:05:57 +00:00
Bill Yi
a87c5a5641 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4393f4ae54b277c694110ace08d1a6ce48acbec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:04:44 +00:00
TreeHugger Robot
957768ce00 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:01 +00:00
Ats Jenk
c2fae645f0 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764 am: 7dad9f50a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659

Change-Id: I45d7ac7982ea7306ae2ed069920c201f3116ba54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 17:06:30 +00:00
Ats Jenk
7dad9f50a9 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659

Change-Id: I11cc8ff6ad5b704ecb6c20f5b5975c7cb2cb14a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 16:40:24 +00:00
Ats Jenk
3f000fa764 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev 2022-08-12 16:22:44 +00:00
TreeHugger Robot
a9954d066b Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8 am: 5cf9730c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134

Change-Id: I64c11a0a7e9e03246a3bc05ea969eb889448ceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 16:17:00 +00:00
TreeHugger Robot
5cf9730c31 Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134

Change-Id: Iece6c6ec5fa09ff8fb5861175742c739b653f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 15:49:19 +00:00
TreeHugger Robot
cfd4e87ac8 Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev 2022-08-12 15:05:49 +00:00
Bill Yi
9e68425844 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iffc5b40bdf48584744bda624b90db1bbc8d31cf6
 2022-08-12 07:36:28 -07:00
Bill Yi
4866003a5d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75a922175180924c2b421e38ba5d0c6cac2c2fcd
 2022-08-12 07:32:53 -07:00
Bill Yi
9d4bf7b223 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f852ef2312fc59d8aa1cb46ee7b04c33ec2b13f
 2022-08-12 07:30:07 -07:00
Bill Yi
0d14a19eee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3e12999c8049c46ebdc24abce1b01aa5bd90b103
 2022-08-12 07:26:23 -07:00
Yanting Yang
ea6a06c8e8 Check DISALLOW_APPS_CONTROL before performing reset app preferences 
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.

The function of reset app preferences will re-enable the disabled apps,
it can let users bypass DISALLOW_APPS_CONTROL to enable an app disabled
by IT admin to see sensitive information.

To fix this vulnerability, we add a check for DISALLOW_APPS_CONTROL
restriction before users reset app preferences. Once the restriction is
enabled, it will show dialog “Blocked by your IT admin” instead.

Bug: 238745070
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: Iffee73cf4952b686a78b4c7aaa54747971337d03
(cherry picked from commit 4356c9c653)
 2022-08-12 12:25:48 +00:00
TreeHugger Robot
fdccd0c4d9 [automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976de -s ours am: b88e71b1c0 -s ours 
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdc is already in history

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

Change-Id: Ia37654ee538bd18f326ec2fa4cca71ab95c6d392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 10:55:00 +00:00
Zaiyue Xue
812a63e5c2 [automerger skipped] Fix import of anyLong in BatteryChartPreferenceControllerTest. am: 2e7957727f -s ours am: 0a71d08b7d -s ours 
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdc is already in history

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

Change-Id: I2ca6ee5182d2492dc29aaa2d305e1f246492092f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 10:54:57 +00:00
TreeHugger Robot
b88e71b1c0 [automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976de -s ours 
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdc is already in history

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

Change-Id: Id7f285b8394b5d8d24b94ed4ab7d47c8d8f1b5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 10:12:10 +00:00
Zaiyue Xue
0a71d08b7d [automerger skipped] Fix import of anyLong in BatteryChartPreferenceControllerTest. am: 2e7957727f -s ours 
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdc is already in history

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

Change-Id: I136ba7fbeaf21b60067a5a2d163222cb43c8126c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 10:12:05 +00:00
TreeHugger Robot
5ab0a976de Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev 2022-08-12 10:00:55 +00:00
TreeHugger Robot
a44044dfe6 Merge "Fix the header can't be scrolling problem in landscape mode" 2022-08-12 07:30:22 +00:00
Zaiyue Xue
2e7957727f Fix import of anyLong in BatteryChartPreferenceControllerTest. 
This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.

Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38
 2022-08-12 13:57:53 +08:00
TreeHugger Robot
9178137457 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" 2022-08-12 05:31:38 +00:00
Yanting Yang
b88d1b6e3c Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" 2022-08-12 05:24:06 +00:00
Treehugger Robot
25ffab4db6 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26 am: bf0cb88417 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I342a1e0a403e8971eb69ae518a6b1aef125e6661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 04:22:48 +00:00
Treehugger Robot
bf0cb88417 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: If86acd9982d50238c1ed31f78735ef805857bc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 04:02:56 +00:00
Treehugger Robot
62fa667b26 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I49eb01dd9ecf0f6bb606c778bbd0acbc99b11a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:47:12 +00:00
Treehugger Robot
2aa8cd1d1a Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: Ib7211f190336de2c318f117ebe2ab71ed5b35062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:20:59 +00:00
TreeHugger Robot
d47e03e617 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094 am: 79bdae659c -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 e1f72b7f3c is already in history

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

Change-Id: Ib6388b2f24a3744b48b65ea4d1ebaf7a0c996864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:05:11 +00:00
Treehugger Robot
e194aa42eb Merge "Fix permissions for internal links." am: 24f45fbd63 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:03:53 +00:00
TreeHugger Robot
79bdae659c Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590401

Change-Id: Ic53e1282db41bf8c8c66e8d750179189b3b1af1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:46:52 +00:00
Treehugger Robot
24f45fbd63 Merge "Fix permissions for internal links." 2022-08-12 02:44:31 +00:00
TreeHugger Robot
0077129094 Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev 2022-08-12 02:27:36 +00:00
Betty Chang
b9abc156c8 Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde am: 0c2a3ead2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: I85e2d5a8589cf775ca2da2d79081eddbd9b59378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:24:02 +00:00
TreeHugger Robot
044887da8e Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb am: d208da6546 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: I815b5f1af564e64e73cbc352b7b1cd233bd64537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:23:35 +00:00
Betty Chang
0c2a3ead2b Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 01:40:05 +00:00
TreeHugger Robot
d208da6546 Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: Ib8bb80d10095f4de2d14bbe4facd1534977e0b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 01:39:40 +00:00
Betty Chang
9c0904acde Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev 2022-08-12 01:29:01 +00:00
TreeHugger Robot
2cd733dcdb Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev 2022-08-12 01:19:01 +00:00
Bill Yi
6e59b16b1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id9572b300cf64f784cdde6fd770f7cd9930ea467
 2022-08-11 16:31:32 -07:00
Bill Yi
2337f90b7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4577f4c82707cac007f20516c8605c6dec9fc613
 2022-08-11 16:27:09 -07:00
Bill Yi
9257e5881a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib173df0df75a70cfe0e675ed9507bf28916e7094
 2022-08-11 16:22:42 -07:00
Prabal Singh
8a932c81be Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31 am: 94e073ce33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: Id246345cc0366630a2e8a83b3b3e717e347cbd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 22:44:37 +00:00