Commit Graph

72517 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
2c5a0d7e6b Merge "Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737" into rvc-qpr-dev-plus-aosp am: 4a0a7b5e45 am: e2e4f5a45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: If5ffc1b3ccf6a60fce26dc0876d64f0556ee80bf
2020-06-11 12:40:21 +00:00
TreeHugger Robot
6374aa8b1a Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: f7bc707706 am: c385b4a380 am: 89570dc404
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: Ia31d200fc6a4c85097a174cf6a3249d3028292da
2020-06-11 12:40:09 +00:00
TreeHugger Robot
6c598b5482 Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: eb4a0e7507 am: 777ff5f628 am: ea4404bb1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: Ia5e0f10ea17247166e0f37114aedc1062f752a9b
2020-06-11 12:39:58 +00:00
Automerger Merge Worker
e2e4f5a45d Merge "Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737" into rvc-qpr-dev-plus-aosp am: 4a0a7b5e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I1f98641df7707681a4f2352c635ea0bf7d769d66
2020-06-11 12:25:33 +00:00
TreeHugger Robot
89570dc404 Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: f7bc707706 am: c385b4a380
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I29c7c429974790b082d0b3af4a195721079dfbe5
2020-06-11 12:25:05 +00:00
TreeHugger Robot
ea4404bb1e Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: eb4a0e7507 am: 777ff5f628
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I5bf1286dfc43cbb919153288321f25a871d1595c
2020-06-11 12:24:52 +00:00
Automerger Merge Worker
4a0a7b5e45 Merge "Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737" into rvc-qpr-dev-plus-aosp 2020-06-11 12:07:13 +00:00
TreeHugger Robot
95717194cb Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

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

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

Change-Id: I68b300ab243690514ab14d7ba61f636f039c2a57
2020-06-11 12:06:53 +00: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
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
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
Automerger Merge Worker
c2d1dd1acb Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp am: 6780306ec1 am: e6dbeccec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: I89feba9fe1176eb0a14428cfcee5a3ae46cba8cd
2020-06-11 10:43:36 +00:00
András Klöczl
9037d1110a Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02 am: 6c9f5797c4 am: d209f1e782
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: I56d518577bb42ef1e6562233eb67585c486f8365
2020-06-11 10:43:21 +00:00
András Klöczl
ab75e5db0d Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3 am: 46bfb08216 am: e551663f17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: I29748d10062bcf3add38708b7691ca59d2f9e483
2020-06-11 10:43:08 +00:00
Automerger Merge Worker
e6dbeccec1 Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp am: 6780306ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: Ia21b19dc03ca5c41f245ece90a71a294f9fb6601
2020-06-11 10:26:19 +00:00
András Klöczl
d209f1e782 Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02 am: 6c9f5797c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: Ic951f913a15aab58cef686b19ccc4ac46f9f1947
2020-06-11 10:26:01 +00:00
András Klöczl
e551663f17 Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3 am: 46bfb08216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: I4cdd72a6dbca4d802ed8c3ea13d7e0b1777fbec3
2020-06-11 10:25:37 +00:00
Automerger Merge Worker
6780306ec1 Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp 2020-06-11 09:57:59 +00:00
András Klöczl
1b3e5c7aed Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

Change-Id: Ic015fa7828a7c32a4238a8cf3deeacf384dc6da5
2020-06-11 09:57:50 +00:00
András Klöczl
6c9f5797c4 Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951

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

Change-Id: I4db1231c83ca921c975f1ef273c4e650e6ff3f23
2020-06-11 09:57:38 +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
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
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
tim peng
6cda035060 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c0681db2b9 am: f78d9578c0 am: 7e7ca4d301
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: I9eacf47a2ed6139674e273a8956a3259d72a2b43
2020-06-11 07:16:53 +00:00
Automerger Merge Worker
4559ac681a Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7 am: 8a726c0463 am: ac845abc2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: I233539d0b77c6c75a7716391610840f80870fa23
2020-06-11 07:16:34 +00:00
tim peng
81a8b86e69 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c7005e8f1c am: 9987574e34 am: c9e1ee11f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: I179b741dbd53551cac2147a111385548701a4936
2020-06-11 07:15:57 +00:00
tim peng
7e7ca4d301 Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c0681db2b9 am: f78d9578c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: If84067f0878b8e4abf5b2c58dc3d2a10e0fb8db0
2020-06-11 06:58:09 +00:00
Automerger Merge Worker
ac845abc2f Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7 am: 8a726c0463
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

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

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

Change-Id: Icd6805e6b35410430fbeb796e2ad056969292f1b
2020-06-11 06:35:06 +00:00
Automerger Merge Worker
8a726c0463 Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

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

Change-Id: I7f0c4391029662e539454e6a6f3b70719e8aa649
2020-06-11 06:34:46 +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
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
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