Automerger Merge Worker
edc887c7f3
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 5775784492" into rvc-d1-dev-plus-aosp
2020-06-13 00:49:23 +00:00
TreeHugger Robot
75b68e1055
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I6825449dbde20639c440bb73f6f9391ca54b5e94
2020-06-13 00:49:19 +00:00
TreeHugger Robot
44d2ff72a8
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 5775784492
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Iee3f5a3aa710f51c46b70ee3fe2edd38137307b0
2020-06-13 00:49:18 +00:00
TreeHugger Robot
b4e5ddbe05
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 2f75ebed19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I6b09a66fb86ac3b912f692cb345770b629718730
2020-06-13 00:49:12 +00:00
TreeHugger Robot
039a7b619e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Icee464d8647b4d0564474b5e6cf8f02bfaa73a20
2020-06-13 00:30:44 +00:00
TreeHugger Robot
7f8fa44f44
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ia08fa4469f757d18ead86633cd82f5e96a6ef312
2020-06-13 00:30:42 +00:00
TreeHugger Robot
5775784492
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I56a6494e50665fa4e53e88fb3cff0604a1e1f4a9
2020-06-13 00:30:37 +00:00
TreeHugger Robot
2f75ebed19
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I5c6cdfe795d9df67bbb034e2120a0916e0dea570
2020-06-13 00:30:34 +00:00
TreeHugger Robot
4b25f3f159
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-13 00:26:09 +00:00
TreeHugger Robot
d9a246c49e
Merge "Explicitly request focus after button pressed" into rvc-dev
2020-06-13 00:19:44 +00:00
Bill Yi
23e3832fe0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I4248ba5dd6eddcba4c94f9b25e6ef46ffec387c6
2020-06-12 15:02:57 -07:00
Kevin Chyn
1ecaeb33ad
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
am: 5754ba7dce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I7df21689af7f749b37696f67eab1ec6a26adf3d2
2020-06-12 20:20:07 +00:00
Kevin Chyn
f1a45e1257
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
am: 6d5a778090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I39e23f9eb82e59e35bf8124c463d0c3a333caf82
2020-06-12 20:19:48 +00:00
Kevin Chyn
5754ba7dce
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I900d9aa2bd3c584c64785dc60ac646e6fd0ce05a
2020-06-12 20:08:52 +00:00
Kevin Chyn
6d5a778090
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev am: 5c4334276f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838911
Change-Id: I6ebcf9c066ee56092f1b165e806622c1eadc87d4
2020-06-12 20:08:21 +00:00
Kevin Chyn
5c4334276f
Merge "BiometricFragment should commitAllowingStateLoss" into rvc-dev
2020-06-12 19:56:01 +00:00
Beverly
258fd7c03b
Explicitly request focus after button pressed
...
Don't use focusableInTouchMode, it was causing focus/clickability issues
when the device wasn't in touch mode.
Test: manually tap button (tap works first try)
Test: turn on talkback and toggle buttons, also try toggling QS tile
while on the Settings page - doesn't reannounce state
Fixes: 158717450
Change-Id: I785d0200dd61235aa3308a8588f9ee998e7cb6e5
2020-06-12 16:01:50 +00:00
Rubin Xu
670a30e766
Remove password shards from memory
...
Force a garbage collection and zeroize some fields after Activity finishes
Test: Goes through password change flow, then grab a heap dump via
adb shell 'am dumpheap $(pidof com.android.settings)
/data/local/tmp/settings.hprof'
And grep for password in the dump
Bug: 144537463
Change-Id: Idd0a04ada98900aeb2a6d20bb1270a4a4aec2cfd
2020-06-12 15:56:04 +01:00
Jason Chiu
adad56d9e2
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I391ad1f65f6d1fe328254a80540cb75bd2babacf
2020-06-12 12:05:53 +00:00
Jason Chiu
981d30f49e
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 6eca50ddf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: Iafe23935be9d14dc6f9ea05a638e50630b1630ec
2020-06-12 12:05:36 +00:00
Jason Chiu
7b40a59fd1
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I1e4d0fd72093d6674f8960e9af500adaa9d8f36a
2020-06-12 11:44:12 +00:00
Jason Chiu
6eca50ddf0
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: Iba28857a715609cb332f9f50884a4de9ba81e5cb
2020-06-12 11:43:24 +00:00
Jason Chiu
8cbee49d28
Merge "Fix Slice not pinned error" into rvc-dev
2020-06-12 11:31:23 +00:00
SongFerng Wang
c3703cb4fe
Revert "Mainline: removed legacy UI for network selection mode."
...
This reverts commit 521ebeafd3
.
Reason for revert: to fix b/157880043
Bug: 157880043
Test: test legacy UI. PASS
Change-Id: I4116457a1f7fc0a3be142671c5d0439cd6bdf11d
2020-06-12 19:03:54 +08:00
Tim Peng
9bdeef43fd
Refine layout for output switcher panel
...
1. only make the output switcher tall enough to show 6.5 devices
2. enlarge album art to 52*52 and keep same size on group panel
3. reduce panel header top padding
4. enlarge slice first item top padding
5. update slider bar right padding
6. update panel height
7. align slice title item left with panel title icon
8. enlarge slice end item right padding
Bug: 156045699
Test: manual test
Change-Id: I51321d98ef483665689b7e258d6071df76382759
2020-06-12 15:15:00 +08:00
Automerger Merge Worker
d1cc88ce31
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:24 +00:00
Automerger Merge Worker
cab87fe707
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:19 +00:00
TreeHugger Robot
337d64b985
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: bf139f4a58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I52f0cb116a5bcc73947bd775747d7e4499ba3e96
2020-06-12 05:25:19 +00:00
TreeHugger Robot
7483b01c8e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours am: 8215f663ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I2a2ad5dbc5d89c7e8a7ff791a3b1952bf505337f
2020-06-12 05:25:15 +00:00
Automerger Merge Worker
ee1cfddac8
Merge "Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2" into rvc-d1-dev-plus-aosp
2020-06-12 05:25:14 +00:00
tim peng
1d4e2258a2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: de8b0ada5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I7103136caa2b9139e2c598826d6ae7494678c6c0
2020-06-12 05:25:08 +00:00
tim peng
ae2f75a060
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
am: b2ab3dfff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Ia8bafba6aa8fe7042be82288a11b48ec4d3e1839
2020-06-12 05:25:08 +00:00
TreeHugger Robot
8215f663ed
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: I14d51e59d67ded733a532e7d8d15d65269db4c1e
2020-06-12 05:10:44 +00:00
TreeHugger Robot
bf139f4a58
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844686
Change-Id: Ia06d4c03304efea0593eef48b565f99795add280
2020-06-12 05:10:41 +00:00
tim peng
de8b0ada5f
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: I62a7dfd8d9693d15eb6cf6012418c3ba5cc1efd1
2020-06-12 05:10:37 +00:00
tim peng
b2ab3dfff2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502
Change-Id: Id609ee38c9b5230def2c8d1cffb7aac8e209e4e6
2020-06-12 05:10:33 +00:00
TreeHugger Robot
05103c79d1
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-12 05:09:30 +00:00
tim peng
c21406a0a2
Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev
2020-06-12 04:58:04 +00:00
Bill Yi
a891edabdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ibb02d904bcceffdd07fb13dec9b62e72e89ea32d
2020-06-12 03:50:41 +00:00
Tim Peng
27b0ef6eb3
Output switcher panel requires large title icon for Slice slider style
...
-Add "VIEW_TYPE_SLIDER_LARGE_ICON" to be a new panel type which would enlarge its title icon
-Set "VIEW_TYPE_SLIDER_LARGE_ICON" to MediaOutputPanel and MediaOutputGroupPanel
-Extend slider style and add customized icon size
-Add test cases
Bug: 157208551
Test: make -j42 RunSettingsRoboTests
Change-Id: I9b4de4aa552e8b26e766411f7eff93ea1a2d1910
2020-06-12 11:22:17 +08:00
Automerger Merge Worker
50d595d4ee
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: e5c24841f8" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:37 +00:00
Automerger Merge Worker
860e66242a
Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:32 +00:00
Chen Xu
945fa6f547
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: e5c24841f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I6a78ca2602d9c9d81f1db6d80cb7cb3fa96d7a22
2020-06-12 02:56:32 +00:00
Chen Xu
a4a6763dbd
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I60ee8564c111629578c655a00bde6d1bc8abf58b
2020-06-12 02:56:27 +00:00
Automerger Merge Worker
9100e94c03
Merge "Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 72041754a5" into rvc-d1-dev-plus-aosp
2020-06-12 02:56:26 +00:00
TreeHugger Robot
9074a0c6f3
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 72041754a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I784f1ebba2b68f0c78e2976c8c5eb8eb3d9f0423
2020-06-12 02:56:22 +00:00
TreeHugger Robot
50ab6f1fc7
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
am: 9ece2c0ae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I9b366d0a1900be5e9a5d541260c4b06c91f41447
2020-06-12 02:56:14 +00:00
Chen Xu
34a3ec22f4
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I48ef871f2fd9229ff9fb88a2b54126b5a4132908
2020-06-12 02:41:00 +00:00
Chen Xu
e5c24841f8
Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763
Change-Id: I7aeece4315ed3b30da38a810cda49d17262b152f
2020-06-12 02:40:59 +00:00
TreeHugger Robot
72041754a5
Merge "Unicode-wrap app names for default apps summary." into rvc-dev am: 6791e1c09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844071
Change-Id: I578b119b97da6a5351d5ebd4b898de1a88ea500d
2020-06-12 02:40:50 +00:00