PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,192 Commits 1 Branch 0 Tags
302cd0590893059bc9a8998dbb10e6183776b52c
Commit Graph

71192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
266700a7a4 Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: b299d90b7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: I8ddca6ec04857daed135d72bfd0aa2bfebc770f6
 2020-06-11 17:56:47 +00: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
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
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
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
TreeHugger Robot
b299d90b7f 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: I88d711322b1b3ea5f4e50f534bab68e7a5b17b96
 2020-06-11 17:36:29 +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
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
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
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
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