PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,240 Commits 1 Branch 0 Tags
6f11ad85345b32b714662021eea87b091d26f4c3
Commit Graph

72240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6f11ad8534 Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev am: 7e3e9ed32a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835817

Change-Id: I1fe5682763d592f4ba0b0468e829f1b8cbb42991
 2021-04-06 08:55:57 +00:00
TreeHugger Robot
7e3e9ed32a Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev 2021-04-06 08:24:45 +00:00
Pavel Grafov
4350fa4c78 [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 18c04f023a -s ours 
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 16d588c11a is already in history

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

Change-Id: I8f040b6e43390b5efb674bfc464aa4a68527de01
 2021-04-02 19:25:49 +00:00
Pavel Grafov
18c04f023a Prevent disconnecting admin-configured VPN am: 735a216da3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528

Change-Id: Ib7ccf10cba6c1f494bb4dcb7a711aa5a218f9dd8
 2021-04-02 18:57:25 +00:00
TreeHugger Robot
d86780ddc1 Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060694

Change-Id: I57dda339fa89ea790092b24c71a2ac2f0c443fdc
 2021-04-01 16:24:07 +00:00
Tsung-Mao Fang
d80c5bba40 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I0312dc7bf253ef50a89848ae9879646200282e66
 2021-04-01 16:23:51 +00:00
TreeHugger Robot
9258e9ee9d Merge "Only display single line for title" into rvc-qpr-dev 2021-04-01 16:18:08 +00:00
Tsung-Mao Fang
bfb68fa6fe Merge "Revert "Only display single line for title"" into rvc-qpr-dev 2021-04-01 15:56:19 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
Pavel Grafov
735a216da3 Prevent disconnecting admin-configured VPN 
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-04-01 12:39:32 +01:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
ba9215cbda Revert "Only display single line for title" 
This reverts commit 121041cf58.

Reason for revert: Some use cases don't need single line design. see b/184108687

Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
 2021-04-01 04:14:03 +00:00
Bonian Chen
5735be835c Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
 2021-03-31 15:44:41 +00:00
Pavel Grafov
16d588c11a Prevent disconnecting admin-configured VPN 
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.vpn2
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-03-31 15:20:11 +00:00
Bonian Chen
a472f53325 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
 2021-03-31 15:03:38 +00:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" 
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
 2021-03-31 14:30:40 +00:00
Bonian Chen
2b195b4335 Revert "[Settings] Support getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
 2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
 2021-03-31 09:37:03 +00:00
Almaz Mingaleev
7d9233302f Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
 2021-03-30 09:39:21 +00:00
Almaz Mingaleev
87273aab56 Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: If30061d2e580c2cbb0a9ca2dc00f66604264a02d
 2021-03-30 08:57:53 +00:00
Almaz Mingaleev
2cd0b0aadf Merge "Allow alternative time zone ID to be set device's zone." 2021-03-30 08:33:37 +00:00
TreeHugger Robot
1dc5a0cd38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9eda0aed1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5030bc815a27ec6e7049545c4bc1770a7fa838f
 2021-03-30 06:48:20 +00:00
Bill Yi
859ab82e71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb332bcf06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00110a86367afac679541a1777489205fa97c5d5
 2021-03-30 06:48:16 +00:00
TreeHugger Robot
d9eda0aed1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-30 06:24:26 +00:00
Bill Yi
0b2ae5a68f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ede9d88bd047f9d7a5f2f932736593beda3d3af
 2021-03-29 19:58:30 -07:00
Bill Yi
bb332bcf06 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc4689e62ec0e346015676571e920106ac05960a
 2021-03-29 19:09:43 -07:00
Almaz Mingaleev
dd2a685756 Allow alternative time zone ID to be set device's zone. 
If America/Godthab is set as device time zone, display it as if
America/Nuuk is chosen.
If time zone is known, but is not an alternative and not shown
in time zone picker, region will de derived from user's locale.

Bug: 155738410
Test: atest com.android.settings.datetime.timezone.model
Test: set persist.sys.timezone via adb and checked
Date & Time screen

Change-Id: I168fb4319e144dbe9e2496d06a681d4c09b411c0
 2021-03-29 11:18:57 +01:00
TreeHugger Robot
9bd8924364 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b004856084 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0d20a360f0763640c784cf9c0740628e7c05347
 2021-03-27 07:10:20 +00:00
Bill Yi
00f6d40299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d39189020 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e4eff582beebc7cdcc1fbe0f56de46a365f7f1d
 2021-03-27 07:09:51 +00:00
TreeHugger Robot
b004856084 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-27 07:00:50 +00:00
Bill Yi
9d39189020 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I255c64ba434ed52927c5ba5e93d2c04a9c455efc
 2021-03-26 22:00:29 -07:00
Bill Yi
93b834142b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8e82cf7a7a752585e7e9e396004b0e88581b705
 2021-03-26 21:11:53 -07:00
Peter Wang
5ef6e587c1 Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
 2021-03-25 21:36:39 +00:00
Peter Wang
2f30e9107a Merge "Fix coding styles for erase euicc only options" am: d3db03b520 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I0d7be5bf2e40af9a0c345be284a5bcc2058ebc8e
 2021-03-25 20:50:10 +00:00
Peter Wang
d3db03b520 Merge "Fix coding styles for erase euicc only options" 2021-03-25 20:14:54 +00:00
Peter Wang
5babfac3d1 Fix coding styles for erase euicc only options 
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
Merged-In: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
 2021-03-25 11:13:29 -07:00
Peter Wang
204f35dc58 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: I9764d7070c44f8b8db654e9f6520d4f5c6d00cb3
 2021-03-25 04:25:54 +00:00
Peter Wang
3cac950712 Merge "Removed unused import" am: 3fbb8612f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib2f683ebd6e5bb71d9702c698b6a112ba7b523b7
 2021-03-25 03:46:25 +00:00
Peter Wang
3fbb8612f5 Merge "Removed unused import" 2021-03-25 03:12:57 +00:00
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
 2021-03-24 19:32:58 +00:00
Peter Wang
e74a04b3a8 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: Ia2dccf44b762bc5cf805f4c2aa3fea7f937c921c
 2021-03-24 18:56:56 +00:00
Peter Wang
f8f7876c01 Removed unused import 
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
 2021-03-24 11:26:16 -07:00
Peter Wang
0b5532f67c Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2021-03-24 18:12:14 +00:00
Weng Su
0b34d62f6b Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393

Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
 2021-03-24 05:25:04 +00:00
Weng Su
5cb66024fc Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev 2021-03-24 04:56:55 +00:00
TreeHugger Robot
5d8e7a260d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc47e9e3a24a3bf4165bfa9e69b2bdd92e6ba6b9
 2021-03-23 05:08:28 +00:00
Bill Yi
0369e03b49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68e59e49c7642acd59eb289437174bd5bee606f3
 2021-03-23 05:08:23 +00:00
TreeHugger Robot
21802a4598 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-23 04:35:07 +00:00
Janis Danisevskis
a308ea1915 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
 2021-03-23 04:09:47 +00:00
Janis Danisevskis
c90b511239 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I75e8e09c230cfb805ab3b2d6699aca2cd2514eac
 2021-03-23 03:51:26 +00:00