ykhung
b350c66d97
Move the battery components from SettingsGoogle to Settings
...
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I47cbba1cbfd6cb17745e7aaaf56b22e3c9dcd30e
2021-04-07 12:09:54 +08:00
ykhung
cb25cd4df1
Add new battery usage design required string and dimesions am: 0a03f8e2d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103384
Change-Id: Ie90c1fb2ac5da9346a9027b039a2ba0ce10ed4e9
2021-04-07 02:42:27 +00:00
Arc Wang
636e70fbf2
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: I43bb0f47a96719c61c5beb4ddf486b14cbdd6ee8
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-04-07 10:06:45 +08:00
ykhung
0a03f8e2d2
Add new battery usage design required string and dimesions
...
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I82fed0a38168aba47e8267ab4a5fa072d54dce67
2021-04-07 09:44:10 +08:00
Abel Tesfaye
b7a66b3068
Add warning message when camera privacy lock is enabled for
...
smart auto rotate settings fragment
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=SmartAutoRotateCameraStateControllerTest,SmartAutoRotateControllerTest
Bug: 177462182
Change-Id: If443bd2456f3fbe76876777be912b204a50f4088
2021-04-06 19:49:04 +00:00
Weng Su
4981dc6ea1
Maximize compatibility string update
...
- Single AP device:
Title: Extend compatibility
Summary: Helps other devices find this hotspot. Reduces hotspot connection speed.
- Dual AP device:
Title: Extend compatibility
Summary: Helps other devices find this hotspot. Increases battery usage.
- Screenshot:
https://screenshot.googleplex.com/84sFvsDegjvJfWT
Bug: 184595717
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: Idca20d4cf5b174110f800fbed91c404d13994b94
2021-04-07 02:27:00 +08:00
TreeHugger Robot
3bf131201e
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours am: ec2f5b30a3
-s ours am: aef00cff46
-s ours am: 75020d834a
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: I47953b9bfea74f6f66589cc5099f5fc663cf3e3c
2021-04-06 18:18:25 +00:00
TreeHugger Robot
3aa5c0ef32
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours am: 4602a52b36
-s ours am: 39da8197d7
-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: I6a4144e0f0c61256252dbc7273fb11755ee07e2b
2021-04-06 18:18:08 +00:00
TreeHugger Robot
75020d834a
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours am: ec2f5b30a3
-s ours am: aef00cff46
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: Ibbe4216c0cf3a95f5692ff847fc3c3497e8ca15a
2021-04-06 17:40:57 +00:00
TreeHugger Robot
39da8197d7
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours am: 4602a52b36
-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: I631c47e8414f878ac0397ac8d45b8131c0bb606f
2021-04-06 17:40:06 +00:00
Arc Wang
50ea1ac06d
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
am: fe3572be66
am: 2a20e51f91
am: e8e227c363
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Ibaeeef7a9f0240997d9a5f0533623e67cecd6fb7
2021-04-06 17:12:44 +00:00
Sally Yuen
00c6344d72
Merge "Add search keywords for Reduce Bright Colors" into sc-dev am: ccda90bd83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13700903
Change-Id: I8930b5cabaa6f38b83ac376ac47e0d259b258aa4
2021-04-06 17:11:23 +00:00
TreeHugger Robot
9789cfb7b4
Merge "Handle modern OPEN_BY_DEFAULT action" into sc-dev am: 24cad3e713
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078596
Change-Id: I7e66da2ec0e8abeab515e4323a5e5456d61cdf4a
2021-04-06 16:49:26 +00:00
TreeHugger Robot
aef00cff46
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours am: ec2f5b30a3
-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: I73f06fb323f6ddab7c9ca48de8b81bb632240446
2021-04-06 16:49:14 +00:00
Arc Wang
e8e227c363
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
am: fe3572be66
am: 2a20e51f91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I415c89bf591503bc8b1dbff8e0f13da03db309fd
2021-04-06 16:33:08 +00:00
Sally Yuen
ccda90bd83
Merge "Add search keywords for Reduce Bright Colors" into sc-dev
2021-04-06 16:32:53 +00:00
TreeHugger Robot
24cad3e713
Merge "Handle modern OPEN_BY_DEFAULT action" into sc-dev
2021-04-06 16:32:07 +00:00
TreeHugger Robot
4602a52b36
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-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: I87e3d728a2c10c857062b706541a26c939b09902
2021-04-06 16:06:59 +00:00
TreeHugger Robot
ec2f5b30a3
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-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: Ia5e57f1a3b06ef105cf209df0f70c05783e05471
2021-04-06 16:02:14 +00:00
Arc Wang
5cfdb6dea7
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
am: bd35c42fd6
am: d10cc6c80d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Ifa682cf9e9b527ab985698fdf99703a6dfd63797
2021-04-06 15:55:12 +00:00
Rubin Xu
7a103e20ef
Merge "Correctly save credential on config changes" into sc-dev am: 9527ee9aed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103545
Change-Id: If03fcecf0a803a1541107675871d889f2327ad77
2021-04-06 15:54:53 +00:00
Arc Wang
d10cc6c80d
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
am: bd35c42fd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I2ac3093f0d111e42e58e518ab3977920d6012a36
2021-04-06 15:47:25 +00:00
Arc Wang
2a20e51f91
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
am: fe3572be66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Ib575416cf0f1de16cbac939d3e16ba08281a40d4
2021-04-06 15:42:49 +00:00
Rubin Xu
9527ee9aed
Merge "Correctly save credential on config changes" into sc-dev
2021-04-06 15:22:13 +00:00
TreeHugger Robot
8ad7f62a65
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-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: Ic3d1e0553dee77abe9930df9f70423f41048af21
2021-04-06 15:20:44 +00:00
Arc Wang
bd35c42fd6
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Ic69d0cc8020b52a65c9d60a03e98e6c8ad753e60
2021-04-06 15:06:21 +00:00
Arc Wang
fe3572be66
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I9fe6a78f1970d85fd30ee3d69b465de523ffddbc
2021-04-06 15:01:42 +00:00
TreeHugger Robot
47c4492d09
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-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: I03ab6cfd3dcf31340f4beacc1782881db3fa7bde
2021-04-06 14:40:35 +00:00
Arc Wang
401bf3ed47
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: eeb0bcc1b7
am: ab59455727
am: 2d20ab7ea7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I047a4183604e750eabb9c24881bb68d4aaaa0041
2021-04-06 14:21:15 +00:00
Arc Wang
767f72b09b
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I5a1cc56ebca9f1f9dc289a4622b4db22a62a6f73
2021-04-06 14:19:47 +00:00
Arc Wang
2d20ab7ea7
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: eeb0bcc1b7
am: ab59455727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I3c9fb98bb5e280597d912e58a03df2337794af82
2021-04-06 14:02:53 +00:00
TreeHugger Robot
04c2f0b19a
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-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: Ic9924a9f19a55616cc0c754a4d7dbda9e02143bb
2021-04-06 14:02:52 +00:00
Arc Wang
b4f0058c31
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: 4c1e380701
am: 647188cb90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Icd974498d2faa87bb324310b433d16b94184a830
2021-04-06 13:59:23 +00:00
Kholoud Mohamed
4572279ca2
Merge "Ignore failing test" into sc-dev am: 0a848989f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100777
Change-Id: I5bed5de7b78a2d038a40348b532527359374673c
2021-04-06 13:57:45 +00:00
Arc Wang
647188cb90
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: 4c1e380701
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I64c6f52ba14d787410088ab069184eec6686363d
2021-04-06 13:42:21 +00:00
Arc Wang
30ab86df65
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I02b3f057bfb03aa1e2d57ba0ce22854df6690bd9
2021-04-06 13:37:25 +00:00
Kholoud Mohamed
0a848989f2
Merge "Ignore failing test" into sc-dev
2021-04-06 13:37:12 +00:00
kholoud mohamed
f89306dace
Ignore failing test
...
Temporarily ignore the following failing presubmit test until the culprit
change is found
InteractAcrossProfilesDetailsTest#getPreferenceSummary_appOpNotAllowed_returnsNotAllowed
Test: atest InteractAcrossProfilesDetailsTest
Bug: 184238335
Change-Id: Ia6aa957bc0928e3a82465f35eda99938d34f19c4
2021-04-06 14:36:05 +01:00
Rubin Xu
da09a8547d
Correctly save credential on config changes
...
Need to make a copy of the LockscreenCredential in
onSaveInstanceState() since the credential will be
zeroized in onDestroy() while Bundle.putParcelable()
only keeps a reference of the object without any
copying.
Bug: 179108398
Test: manual
Change-Id: I090b691630f82406d1ae2f625dd2e0d578b83707
2021-04-06 14:23:45 +01:00
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
4c1e380701
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: I21ed6d8435f63c4184f606bdffbd9e7739a04445
2021-04-06 13:01:25 +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
TreeHugger Robot
c6b3125477
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
am: a2a7d18353
am: 848483a8e8
am: 3851053118
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Ib0bf2e9f11a19ead6d1cf64c8720438229e1fda4
2021-04-06 12:15:04 +00:00