TreeHugger Robot
f836c42063
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: Idafdf6a714a9c35f92a21684de3aeb941f772e12
2020-06-11 17:56:12 +00:00
Automerger Merge Worker
93dc50a6df
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: 928e81ae49" into rvc-d1-dev-plus-aosp
2020-06-11 17:55:46 +00:00
Joshua Duong
41c3dc79df
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
am: 928e81ae49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: I419b3b9af1fa6df8484dd9f5238d8a251cb0422f
2020-06-11 17:55:36 +00:00
Joshua Duong
ac85fec739
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: Idb0fee5e98d8618634eace2b5adabc65997c7cf9
2020-06-11 17:55:24 +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
Joshua Duong
928e81ae49
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: If2438ebe5f39ba9543d3a74d27e71902f6f93c4e
2020-06-11 17:36:19 +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
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
2c24c39737
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a
am: 7b63dda831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: Ib7a077eadb53639139e49b7a63fb8591bc1a3c0d
2020-06-11 11:52:07 +00:00
TreeHugger Robot
eb4a0e7507
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: I30c4b2324ca889084e5040525da4250a24c410c2
2020-06-11 11:51:58 +00:00
TreeHugger Robot
7b63dda831
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: I7d8fb6ae02a41c2cc76241e3d3cd3252dbc8d459
2020-06-11 11:32:02 +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
28fd271f02
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb
am: cfe3027432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4a3c91a7a33147753764d93ed307c5cf166ac101
2020-06-11 09:35:32 +00:00
András Klöczl
4e2a9a04e3
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: Idf895f299526d9eacdd139d8dbe77e98c22d1e1d
2020-06-11 09:35:24 +00:00
András Klöczl
cfe3027432
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: I56ac089933167479e20ccdb731e5b506dfbbbf48
2020-06-11 09:01:25 +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
Automerger Merge Worker
dc4e43c9a7
Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829
am: 0022d19d92" into rvc-d1-dev-plus-aosp
2020-06-11 06:24:36 +00:00
tim peng
38def3982b
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829
am: 0022d19d92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I4945ef1b7e42bc3c9a617747559f0a1d2f6da0c5
2020-06-11 06:24:32 +00:00
tim peng
c7005e8f1c
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: Ia0b24f6991b290a35261611245b1dd592a621acb
2020-06-11 06:24:26 +00:00
tim peng
0022d19d92
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: Ic25cbabe73970d7e53d09dd1ca3b426998c2e8aa
2020-06-11 06:09:41 +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
67e8c6b1e9
[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: Ieb440bf082161fb7707adfc9edd369b2212c86b9
2020-06-11 02:10:17 +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
9899db6e9d
[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: Idf6e18da03b802d462dceedcb2964e62f2d184a7
2020-06-10 22:53:24 +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
c8887a3d0a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 005686ff69
-s ours am: cb37e29122
-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: Ie3a2c9074b59f4ff875963a7282aee98fcc4939e
2020-06-10 20:56:41 +00:00
TreeHugger Robot
47edbd0a5b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f77400c5a2
-s ours am: 831fe57596
-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: I2fd216e401739287980c31e671a0f7a372b972ef
2020-06-10 20:56:27 +00:00
TreeHugger Robot
d8ee7f9d86
[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: Ie0df31c6323a2f0b4bfb843ca23d632b916377f9
2020-06-10 20:56:15 +00:00
TreeHugger Robot
59fb8a008a
[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: I8efa988c0243b80a03dd65df67f1e0b11cdc7f34
2020-06-10 20:56:05 +00:00
TreeHugger Robot
cb37e29122
[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: I6feb305cc52dbd2c8941955dc3a7557fddf746a6
2020-06-10 20:45: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
831fe57596
[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: I81407535222414560c235e4b152aff9bd347387f
2020-06-10 20:44:16 +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
TreeHugger Robot
f77400c5a2
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-10 20:26:24 +00:00
Bill Yi
656e36cc3c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I656b8da709ee3faaed1090b4bf038914278696ff
2020-06-10 18:58:47 +00:00
Bill Yi
47ee699c6b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic4a3a9d8b81c0512788ca40b3a28900de0680856
2020-06-10 18:17:40 +00:00
Bill Yi
d5d16e0b57
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic5fdc81f34e3953154ca29108f16c0583e66e6ea
2020-06-10 17:39:37 +00:00
Bill Yi
6cf65538b2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic608181e33931fdde5423eb6c5e298c363c594c9
2020-06-10 17:02:10 +00:00
Goven Liu
5200a96fb7
Merge "[Wi-Fi] Request focus on input field when config a WiFi network" into rvc-dev am: 75d8ada079
am: 39b77cfc2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818501
Change-Id: I111dbaa757ffddeb38b0c0e026f8875f82bb5391
2020-06-10 09:43:39 +00:00
Goven Liu
19a357bd33
Merge "[Wi-Fi] Request focus on input field when config a WiFi network" into rvc-dev am: 75d8ada079
am: 194780965f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818501
Change-Id: I01c6ead928b15b21cfb1e0b1bea6be83cd675820
2020-06-10 09:43:11 +00:00
Goven Liu
39b77cfc2f
Merge "[Wi-Fi] Request focus on input field when config a WiFi network" into rvc-dev am: 75d8ada079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818501
Change-Id: I2598e69139714bc466563cace94ba33e91f3fe89
2020-06-10 09:31:17 +00:00
Goven Liu
194780965f
Merge "[Wi-Fi] Request focus on input field when config a WiFi network" into rvc-dev am: 75d8ada079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818501
Change-Id: If45a7ff167a2df5c9b490cced15dce18d8a737b5
2020-06-10 09:31:09 +00:00
Goven Liu
75d8ada079
Merge "[Wi-Fi] Request focus on input field when config a WiFi network" into rvc-dev
2020-06-10 09:13:38 +00:00