Match Wi-Fi and Settings icons with standard Material geometry

This commit is contained in:
Elijah 2026-10-25 12:13:55 -07:00
parent 6a08aa242c
commit 04c980f32a
11 changed files with 224 additions and 10 deletions

View file

@ -24,8 +24,8 @@ public final class MainActivity extends Activity {
private FocusScrollView scroll;
private LinearLayout content, appsContainer, mediaContainer, hero, sectionHeading;
private PlexClient.Media plexFeatured;
private TextView clock, eyebrow, headline, description, openHint, appCount, settingsButton;
private ImageButton inputButton, networkButton;
private TextView clock, eyebrow, headline, description, openHint, appCount;
private ImageButton inputButton, networkButton, settingsButton;
private NetworkStatus networkStatus;
private TvInputs tvInputs;
private List<TvInputs.Source> inputSources = Collections.emptyList();
@ -197,8 +197,13 @@ public final class MainActivity extends Activity {
LinearLayout.LayoutParams networkLp = new LinearLayout.LayoutParams(d(39), d(34));
networkLp.leftMargin = d(17);
header.addView(networkButton, networkLp);
settingsButton = chip("⚙", v -> showSettings());
settingsButton.setTextSize(19);
settingsButton = new ImageButton(this);
settingsButton.setImageResource(R.drawable.ic_settings);
settingsButton.setImageTintList(Ui.textColors());
settingsButton.setPadding(d(9), d(7), d(9), d(7));
settingsButton.setFocusable(true);
Ui.glass(settingsButton, 18);
settingsButton.setOnClickListener(v -> showSettings());
settingsButton.setContentDescription("Luma settings");
settingsButton.setId(View.generateViewId());
inputButton.setNextFocusRightId(networkButton.getId());

View file

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFFFFFF" android:pathData="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z" />
</vector>

View file

@ -1,3 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFFFFFF" android:pathData="M12,21L15,18C13.34,16.34 10.66,16.34 9,18ZM6,15L8,17C10.21,14.79 13.79,14.79 16,17L18,15C14.69,11.69 9.31,11.69 6,15ZM2,11L4,13C8.42,8.58 15.58,8.58 20,13L22,11C16.48,5.48 7.52,5.48 2,11Z" />
<path android:fillColor="#FFFFFFFF" android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zm8,8l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zm-4,-4l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z" />
</vector>

View file

@ -1,3 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFFFFFF" android:pathData="M2.3,1L1,2.3L5.2,6.5C3.7,7.2 2.3,8.2 1,9.5L3,11.5C4.3,10.2 5.8,9.2 7.3,8.6L9.5,10.8C7.8,11.2 6.2,12 5,13.3L7,15.3C8.4,13.9 10.3,13.3 12.1,13.5L14.5,15.9C12.8,15.2 10.8,15.5 9.5,16.8L12,19.3L14.7,16.6L21.7,23.6L23,22.3ZM12,5C16.1,5 19.9,6.6 23,9.5L21,11.5C18.5,9 15.3,7.8 12,7.8L9.2,5.1C10.1,5 11,5 12,5Z" />
<path android:fillColor="#FFFFFFFF" android:pathData="M22.99,9C19.15,5.16 13.8,3.76 8.84,4.78l2.52,2.52c3.47,-0.17 6.99,1.05 9.63,3.7l2,-2zm-4,4c-1.29,-1.29 -2.84,-2.13 -4.49,-2.56l3.53,3.53 0.96,-0.97zM2,3.05L5.07,6.1C3.6,6.82 2.22,7.78 1,9l1.99,2c1.24,-1.24 2.67,-2.16 4.2,-2.77l2.24,2.24C7.81,10.89 6.27,11.73 5,13v0.01L6.99,15c1.36,-1.36 3.14,-2.04 4.92,-2.06L18.98,20l1.27,-1.26L3.29,1.79 2,3.05zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0z" />
</vector>

View file

@ -8,6 +8,8 @@ Final generation prompt:
App banners and icons are loaded from installed Android packages and retain their respective owners' branding. Plex artwork is retrieved from the user's connected server. Aurora and Midnight scenes are code-native gradients.
The Wi-Fi, Wi-Fi-off, and Settings vector paths use Google's [Material Icons Wi-Fi](https://github.com/google/material-design-icons/blob/master/src/notification/wifi/materialicons/24px.svg), [Wi-Fi-off](https://github.com/google/material-design-icons/blob/master/src/notification/wifi_off/materialicons/24px.svg), and [Settings](https://github.com/google/material-design-icons/blob/master/src/action/settings/materialicons/24px.svg), Copyright Google LLC, under the [Apache 2.0 license](licenses/material-icons-LICENSE.txt). The standard geometry keeps the Wi-Fi bands/gaps consistent at TV size and replaces the font-dependent gear with a matching filled vector.
# Screensaver media
The offline image catalog is `app/src/main/assets/saver/catalog.json`, with titles, credits, and source links. The Met's object API marked each included painting `isPublicDomain=true` at retrieval; only works with that flag and an available image are eligible for in-app gallery downloads. See [The Met Open Access API and CC0 description](https://metmuseum.github.io/).

View file

@ -1,3 +1,3 @@
Adds Uninstall app to the held-OK menu for user-installed apps, with Android confirmation. Fixes D-pad app rearranging and keeps focus on the moving app. Adds a network status shortcut beside Settings, with separate space for TV inputs. Removes the duplicate Personalize button at the bottom of Home.
Adds Uninstall app to the held-OK menu for user-installed apps, with Android confirmation. Fixes D-pad app rearranging and keeps focus on the moving app. Adds a network status shortcut beside Settings, with separate space for TV inputs. Uses evenly spaced Material Wi-Fi bands and a matching filled Settings icon. Removes the duplicate Personalize button at the bottom of Home.
Signing identity changed because the original key was lost. Devices running 1.1.12 or older need a one-time uninstall and reinstall of this release; Android cannot install it over the old signing identity. Reinstalling resets Luma settings and Plex credentials. Future updates use the new key.

View file

@ -278,3 +278,5 @@ Physical Ethernet, captive-portal/limited-internet hardware states, and real phy
The signing migration required a reinstall of the authorized test device. The visible five-column layout, Kaleido-first ordering, Scenic screensaver with clock, and previously downloaded nature video were restored through Luma UI. Existing versions on the other two devices require a one-time reinstall; signature and update integrity checks remain enabled. Future releases must retain the new key.
Final cleanup restored the prior enabled-accessibility list (Button Mapper plus Luma's own Home override) and notification permission. Home returned from native Android settings to Luma after its existing accessibility redirect. Android's native Home selection and other launchers were preserved. The diagnostic APK was removed from all profiles, temporary on-device captures were deleted, and the installed APK SHA-256 matched the release manifest. The final Home screenshot was visually checked: the Wi-Fi icon has separate space beside the gear and the five-column app layout is intact.
Before publication, the Wi-Fi/Wi-Fi-off vectors were replaced with standard Material paths to correct uneven band spacing. The Unicode Settings glyph was replaced with the matching filled Material Settings vector and the same ImageButton padding/tint/focus treatment as the network button. Both were visually checked in a fresh TV screenshot. HomeActionsInstrumentation passed again after the Settings view-type change, including header focus and non-overlap; clicking the new gear opened Luma settings. Source attribution and the Apache 2.0 license are retained in docs/ASSETS.md and docs/licenses/.

View file

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Binary file not shown.

Binary file not shown.

View file

@ -5,7 +5,7 @@
"versionName": "1.1.13",
"minSdk": 26,
"apk": "Luma.apk",
"size": 2762079,
"sha256": "e15ddbc7f1ab31d39769f21bcf7f39a9866b38ed9fe53465013467f866b32c98",
"notes": "Adds Uninstall app to the held-OK menu for user-installed apps, with Android confirmation. Fixes D-pad app rearranging and keeps focus on the moving app. Adds a network status shortcut beside Settings, with separate space for TV inputs. Removes the duplicate Personalize button at the bottom of Home.\n\nSigning identity changed because the original key was lost. Devices running 1.1.12 or older need a one-time uninstall and reinstall of this release; Android cannot install it over the old signing identity. Reinstalling resets Luma settings and Plex credentials. Future updates use the new key."
"size": 2766249,
"sha256": "7fcffec0860791ed14db0924a35361225b89789f6cfe202c3d62390a92a16b3a",
"notes": "Adds Uninstall app to the held-OK menu for user-installed apps, with Android confirmation. Fixes D-pad app rearranging and keeps focus on the moving app. Adds a network status shortcut beside Settings, with separate space for TV inputs. Uses evenly spaced Material Wi-Fi bands and a matching filled Settings icon. Removes the duplicate Personalize button at the bottom of Home.\n\nSigning identity changed because the original key was lost. Devices running 1.1.12 or older need a one-time uninstall and reinstall of this release; Android cannot install it over the old signing identity. Reinstalling resets Luma settings and Plex credentials. Future updates use the new key."
}