PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,580 Commits 1 Branch 0 Tags
d1cc88ce31b5ee3f7cc3e99d3985b4394ab6789a
Commit Graph

64580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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