Commit Graph

62309 Commits

Author SHA1 Message Date
Kevin Chyn
bc8814da7c 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: Id853e4aac4590a0fc92a8f2debb4bee02de7736b
2020-06-12 20:19:45 +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
Jason Chiu
e6eb3775ac 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: I4b982cfb1b71506ce45b02ee3b7cfea8c04fb673
2020-06-12 12:05:24 +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
8cbee49d28 Merge "Fix Slice not pinned error" into rvc-dev 2020-06-12 11:31:23 +00:00
TreeHugger Robot
005448ab04 [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: Ia24a58b220fb67cc562a2acb8cf641e5c6b57ac0
2020-06-12 05:25:13 +00:00
tim peng
94cc0775d9 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: I769ad89870ac16016683e8cfaed2488e4a6d78a7
2020-06-12 05:25:06 +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
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
Chen Xu
8db9c072cf 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: I7e49a8d9eaa2d562d32d78193387b2fa7f7ee46d
2020-06-12 02:56:24 +00:00
TreeHugger Robot
632bda0e30 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: I4a001a32186ee9913934f7dcc31a992d09af28bf
2020-06-12 02:56:13 +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
TreeHugger Robot
9ece2c0ae7 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: I2fdb01e00f706fc50d1fe37b9a462aeb08e2c6f1
2020-06-12 02:40:44 +00:00
Chen Xu
6ebe9ae0ff Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev 2020-06-12 02:29:17 +00:00
TreeHugger Robot
6791e1c09b Merge "Unicode-wrap app names for default apps summary." into rvc-dev 2020-06-12 02:28:48 +00:00
Hai Zhang
3f511d8ca9 Unicode-wrap app names for default apps summary.
This was done for permissions summary inside PermissionController, so
also do it in Settings.

Bug: 153804329
Test: manually confirm that the summary matches what linguist
      suggested after fix
Change-Id: I650fbed4488abfd871adafba5afb1ae9a2995c62
2020-06-11 16:54:25 -07:00
Jason Chiu
f7afded1d1 Fix Slice not pinned error
Slices should be pinned before being bound. The original design calls
registerSliceCallback() to pin a slice, and then calls bindSlice() and
passes the result to the callback directly. When the callback is
called, it executes unregisterSliceCallback() and unpins the slice.

However, registerSliceCallback() starts to observe the slice change and
then rebind it in an AsyncTask. If the slice is updating via its
background worker and the timing of the binding overlaps the callback
execution, it's possible to bind the slice right after unpinning it and
causes the error.

The solution is to remove the callback mechanism, and just to pin, bind
and unpin the slice directly.

Fixes: 157387583
Test: robotest
Change-Id: I8748dd3038a3662599935f07420d07cf254a4073
2020-06-12 04:14:46 +08:00
Kevin Chyn
895ddf239a BiometricFragment should commitAllowingStateLoss
This is a terminal case for both authentication as well as the
activity itself, so this should be safe.

Fixes: 158635014

Test: Builds
Change-Id: Ieef1ab305e6518dbc0ae34ad59d52da82895972a
2020-06-11 12:59:05 -07:00
TreeHugger Robot
38aaa31584 Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: Icf50cfb1ae51a07c3ac86b183f53607ea8ea69d1
2020-06-11 17:56:19 +00:00
Joshua Duong
4e3d96116f Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: I67d23dafeb10db85c0b07a746c540dbf2dffd318
2020-06-11 17:55:40 +00:00
TreeHugger Robot
4327cd65cc Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: Icc6c824db2ad89a8a18fdcdcd595afc4f406aa6d
2020-06-11 17:37:14 +00:00
Joshua Duong
b84cafa24c Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: Ib5e569614e15f5c39590fc40a18b2673e45f9767
2020-06-11 17:36:49 +00:00
TreeHugger Robot
d6081039c6 Merge "Don't pass channel info for the bubble app page" into rvc-dev 2020-06-11 17:23:56 +00:00
Joshua Duong
63facb88bd Merge "[adbwifi] Handle tls port changes." into rvc-dev 2020-06-11 17:23:00 +00:00
Chen Xu
dd3324a326 rename "Emergency Alert" to "Public Warning" per IT requirements
Follow Italy Government requirements to rename setting string for
emergency alerts

Bug: 158094274
Test: Manual
Change-Id: Id969d0f6f9c0282ef3c122ef3ea04a64646024fe
2020-06-11 10:10:05 -07:00
Mady Mellor
87e16f416f Don't pass channel info for the bubble app page
Fixes: 157485149
Test: make SettingsUnitTests; adb shell am instrument etc
Change-Id: If8d9b446ed056996cda91fcc5e92c7077ff3ea5d
2020-06-11 08:33:45 -07:00
TreeHugger Robot
f7bc707706 Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I25fdf7734b3cbd1f8d06333a1c9e78221afe809b
2020-06-11 11:51:55 +00:00
TreeHugger Robot
a4b29edb79 Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I1b1af2087e995308c505d0945fcfd099f44e5349
2020-06-11 11:32:00 +00:00
TreeHugger Robot
ae1ed2508a Merge "Add a new SettingsCategoryPreference style" into rvc-dev 2020-06-11 11:16:55 +00:00
András Klöczl
b04ad237c9 Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: I437174b4527d3cc15527b62b409cfa9a5b9d35ac
2020-06-11 09:35:22 +00:00
András Klöczl
974efbd7f2 Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: Ie3c8012398740f0629ef89fce1574cb21f91667d
2020-06-11 09:01:15 +00:00
András Klöczl
f8754b4deb Merge "Change user setup prompt dialog showing logic" into rvc-dev 2020-06-11 08:47:07 +00:00
tim peng
c0681db2b9 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: I49990d0d2b1010a0576ee083830b3e11e9f7f247
2020-06-11 06:24:23 +00:00
tim peng
8aa018d1b1 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: Ic22de77b2dae64bf64b7f0be29abad135e85c70b
2020-06-11 06:09:38 +00:00
tim peng
359d3ac829 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev 2020-06-11 05:55:21 +00:00
TreeHugger Robot
3a1615a1e2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50105320a02c308163739e04fb82bdb92baa9522
2020-06-11 02:10:25 +00:00
TreeHugger Robot
95ac1222d8 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-11 01:56:48 +00:00
Joshua Duong
76d2afb832 [adbwifi] Handle tls port changes.
Events such as adbd restarts can change the connection port. We need
to update the UI accordingly.

Bug: 158219145

Test: Manual.
1) Enable wireless debugging in Settings and validate port in UI via
> adb shell su 0 netstat -plnt | grep LISTEN
2) Restart adbd: > adb root
3) validate port again (may have changed)

Change-Id: I93339a6a258fbf69fa3f45186863a01126d279ce
2020-06-10 16:56:29 -07:00
TreeHugger Robot
dfc8a8bd59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 428bc4f51d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ea83ae5b44441e4a13b2502e0c8aff371debc83
2020-06-10 22:53:23 +00:00
TreeHugger Robot
428bc4f51d Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-10 22:33:19 +00:00
TreeHugger Robot
b2cffb3e14 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 005686ff69 -s ours am: 8a68fc31e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31bc4626e618320389bd57c40451064e632b4dec
2020-06-10 20:56:15 +00:00
TreeHugger Robot
a6519fbdef [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f77400c5a2 -s ours am: edd858fe90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I407190c794f761c8c74c67467e9cbd6f9d80663c
2020-06-10 20:56:04 +00:00
TreeHugger Robot
8a68fc31e8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 005686ff69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6559c92f4133f675c027dc57f307746eb7ccf75b
2020-06-10 20:45:03 +00:00
TreeHugger Robot
edd858fe90 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f77400c5a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife9fbe7bbc547aa3e3b1f2edcb795c1d22b3afe8
2020-06-10 20:44:12 +00:00
TreeHugger Robot
005686ff69 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-10 20:28:39 +00:00