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

72502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a5715ed5c9 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours 
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: Ife137461365b88bc33cc7e22d72ef4c6b2926357
 2021-04-06 13:18:07 +00:00
Arc Wang
ab59455727 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 am: e1660daab4 am: 83d11bebe2 am: eeb0bcc1b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: Ic93423f744160ff8866e47e63d4ff730e13c137e
 2021-04-06 13:17:57 +00:00
Almaz Mingaleev
3be24f4ab2 Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils. 
That timestamp is used in two places for the same purpose.

Bug: 155738410
Test: presubmit
Change-Id: Ia6836fd34c63aef6e335ef97922d34a60dbf3703
 2021-04-06 14:10:05 +01:00
Arc Wang
89d14a36dc Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Iec105d8ee74d6d2c869072866c4caffbd40d9a19
 2021-04-06 13:01:40 +00:00
Arc Wang
eeb0bcc1b7 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 am: e1660daab4 am: 83d11bebe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: Ie359d84b40c5b7a706f40c8a1c905c8d9c02afab
 2021-04-06 12:56:35 +00:00
TreeHugger Robot
f43af46d1d Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev 2021-04-06 12:51:12 +00:00
Arc Wang
bcc7f89f85 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev 2021-04-06 12:37:52 +00:00
Arc Wang
83d11bebe2 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 am: e1660daab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: Ic9a7c0fb856096e02a20f40fa723a00b62d92819
 2021-04-06 12:35:26 +00:00
Arc Wang
eb2ac6e455 Revert "Hide non-system overlay window on ActivityPicker" 
This reverts commit 855b1f428d.

Reason for revert: <b/184623294>

Change-Id: Ie1eb6f86feda56d6444971fa5dfd2c11357fab01
 2021-04-06 12:29:38 +00:00
Arc Wang
e1660daab4 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: I19629b5e098a176da1fe21e020deb8a78c6069ad
 2021-04-06 11:43:37 +00:00
Arc Wang
9513326e44 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev 2021-04-06 11:03:29 +00:00
Arc Wang
8a9fafb37d Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
 2021-04-06 11:02:10 +00:00
TreeHugger Robot
848483a8e8 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f am: d0957376c0 am: e4749c3458 am: 1dcc4ee8a1 am: a2a7d18353 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: I10f838480c81364933cc02d3c09f17f46d7f2964
 2021-04-06 11:01:45 +00:00
TreeHugger Robot
a2a7d18353 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f am: d0957376c0 am: e4749c3458 am: 1dcc4ee8a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: I5038e3f5ed5963b4bfebd3aa643ce9de4296aed9
 2021-04-06 10:19:22 +00:00
TreeHugger Robot
1dcc4ee8a1 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f am: d0957376c0 am: e4749c3458 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: Id2b2b68996481b1a177a284ef99dbd44bff0946b
 2021-04-06 09:59:08 +00:00
TreeHugger Robot
e4749c3458 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f am: d0957376c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: I3a5f7ae870c60965676dc776120dc220c336b471
 2021-04-06 09:37:39 +00:00
TreeHugger Robot
d0957376c0 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: If51aba7cfb3495b42335d90a1600734da17d4d42
 2021-04-06 09:00:52 +00:00
TreeHugger Robot
7868a16f9b Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158 am: a577227b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816

Change-Id: I17f7826b66a4f328d157d119f8e586bd126ed3e1
 2021-04-06 08:56:03 +00:00
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
a577227b97 Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816

Change-Id: Iaff23732bf96920b8c58e810d9a2a305ff3c274e
 2021-04-06 08:55:53 +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
TreeHugger Robot
7a09c0613f Merge "Hide non-system overlay window on ActivityPicker" into pi-dev 2021-04-06 08:23:13 +00:00
TreeHugger Robot
759dc67158 Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev 2021-04-06 08:22:07 +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