summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-29Merge "TvSettings: fix launching suggestions" into main am: 700112962btemp_319669529Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2973514 Change-Id: I61279887ebfa34db0ebedb46c7c363a117c9094b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29Merge "TvSettings: fix launching suggestions" into mainTreehugger Robot
2024-02-28Update owners file to match internal. Did not cp from internal since there ↵Gerson Rodriguez
were more than 1 change am: b50bd1ab9b Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2982651 Change-Id: I4a7bc98bd89f19c305b5a9e47e3ad56b41ff98a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28Update owners file to match internal. Did not cp from internal since there ↵Gerson Rodriguez
were more than 1 change Change-Id: I4ade17e3f38ef6c8886ad3b10071a9b90369fb7e
2024-02-22TvSettings: fix launching suggestionsTimi Rautamäki
The suggestion activity fails to launch in Android 14 due to BAL changes. Fix the following error: 4155 6519 E ActivityTaskManager: Without BAL hardening this activity start would be allowed!... 4155 6519 W ActivityTaskManager: Background activity launch blocked... Test: manually test Device name suggestion Change-Id: I7c9635f314deade39eeaaf3937fcd7ea3eb37381
2024-02-22Migrate Test Targets to New Android Ownership Model am: a56cb88abaAditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2944804 Change-Id: I41a5490085b8bc7df258475f2e49935e92e6a21f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I79f19079b175be6df63504a65ac1210d042cb2af
2024-01-18Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I8af554f37b07140996fe62a1effa3b08fc786133 Change-Id: I5fc1b25daf365936f42eab10db373044a38bf78e
2024-01-13ui: fix u-disk availsize in tvsetting display error am: 3a1ae1159aJiang Roy
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2905727 Change-Id: Icc4629baa0d706f00a69da77d71f718a53abcb7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11ui: fix u-disk availsize in tvsetting display errorJiang Roy
fix some fat32 u-disks (SanDisk、Kingston) availsize information in tvsetting display error Bug：issues/318788249 Test：plug in u-disk and enter tvsetting to check u-disk information Change-Id: 18b75bb716110e0e79ee55c3a70b11755217abe2 Change-Id: I7422338bcee604b34e1e383780cb51eafc278780
2023-12-21List baseline_filename on modules that are implititly using it am: d6f32ff31cCole Faust
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2886546 Change-Id: I421be109715b15a9a4c83cfcdb5e8e853f359152 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: I98da53d59e12e858faaa725d6ab3300296ab74d4 Merged-In: I98da53d59e12e858faaa725d6ab3300296ab74d4
2023-12-14Merge "Uptesting is moving folks to /external/robolectric from ↵Rex Hoffman
/external/robolectric-shadows" into main
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ba410c01e3 -s ours am: ↵Xin Li
f48d38cad0 -s ours am: 5944674d84 -s ours am skip reason: Merged-In I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 with SHA-1 bdabeeaa5e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2863533 Change-Id: Id6f7bcc0e5e756a0b725daab30314cac5cb6d31c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ba410c01e3 -s ours am: ↵Xin Li
f48d38cad0 -s ours am skip reason: Merged-In I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 with SHA-1 bdabeeaa5e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2863533 Change-Id: I3922bb87fd2e3407342b9a40b4b7a6f870aedf39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ba410c01e3 -s oursXin Li
am skip reason: Merged-In I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 with SHA-1 bdabeeaa5e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2863533 Change-Id: I0ee55545c4a5e519d9f907115476e964ce991369 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Check UserManager.DISALLOW_ADD_WIFI_CONFIG restriction when network fragment ↵eric_kuang
is shown. If UserManager.DISALLOW_ADD_WIFI_CONFIG restriction is set, user can view wifi lists but cannot connect a new wifi. Test: Manual test CTS Verifier: com.android.cts.verifier.managedprovisioning.DeviceOwnerPositiveTestActivity#Disallow adding Wifi config com.android.cts.verifier.managedprovisioning.DeviceOwnerPositiveTestActivity#Disallow configuring Wifi Bug: 271948312 Bug: 313360020 Change-Id: I8af554f37b07140996fe62a1effa3b08fc786133
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 Bug: 315507370 Change-Id: Id4885209d6dd1f6d5bfb53ba1f2912665d88e067
2023-12-08Provide Watson TV Settings intents to create or enter restricted profileOleg Kibirev
This allows setupwraith to trigger these operations for regulatory compliance. Bug: 312260906 To test: adb shell am start -a com.android.tv.settings.action.CREATE_RESTRICTED_PROFILE adb shell am start -a com.android.tv.settings.action.ENTER_RESTRICTED_PROFILE Programmatic callers can use startActivityForResult and check for RESULT_OK to ensure user completed requested operation. Change-Id: If96a078be35295fe09168393d1782592e0ebce70
2023-12-08Merge "Fix sub title for connected Bluetooth device" into main am: ↵Treehugger Robot
7582c3fed8 am: bdabeeaa5e am: d0dd1c4f28 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2737414 Change-Id: I0b543c9f8cc6693c96b7c53bbd800dc3f7287e5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Fix sub title for connected Bluetooth device" into main am: ↵Treehugger Robot
7582c3fed8 am: bdabeeaa5e Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2737414 Change-Id: I843ac8ec6380ee8bafe941701fa37b005a835c16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Fix sub title for connected Bluetooth device" into main am: 7582c3fed8tmp_amf_315507370Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2737414 Change-Id: I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Fix sub title for connected Bluetooth device" into mainTreehugger Robot
2023-12-07Uptesting is moving folks to /external/robolectric from ↵Rex Hoffman
/external/robolectric-shadows We maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows Bug: 314757990 Test: WIP (6 test out of 87 are failing) Flag: NA Change-Id: Ife365d62214e4849cc5c6ffc97399134f477522a
2023-12-07Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia56a562554c6e0dbd399ce1ff4bdeb91ea805599
2023-12-04Recreate slice preferences when changing between inline and embedded typesOleg Kibirev
This fixes blank/incorrect text when switching custom button between inputs mode (preference provided by axel) and app mode (preference provided by LauncherX) Bug: 301530477 Change-Id: I4824eee2c57650aefbaa6ed7e7f8036e01ded1ff
2023-12-01Merge "Use state loss version of fragment transactions" into mainOleg Kibirev
2023-11-30Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-11-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idda7d2195cc16104f14e8bf476419ff84bf9ac7e
2023-11-30Use state loss version of fragment transactionsOleg Kibirev
This should get rid of entire class of rare crashes Bug: 299249188 Change-Id: Ic2d0405e216b52f0aef7f13b4ccd053fe18c2a25
2023-11-30Use native Android lifecycles for Wifi connectivity listenerOleg Kibirev
This will facilitate further migration of TVSettings to use WifiPickerTracker instead of ad hoc code with some missing functionality. Bug: 153627947 Change-Id: I15b777cf115a0087f47d1c4ced69570a9e80da5c
2023-11-29Fix suggestions not being highlighted when selectedOleg Kibirev
Tested: manual, on ATV and GTV Bug: 262758215 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6df92c228c100ef8abcd3a25cac04d152e02ce1) Merged-In: Ic51d04c2e8230feeaa9ce8be035f7144906595e1 Change-Id: Ic51d04c2e8230feeaa9ce8be035f7144906595e1
2023-11-29Merge "Use WifiEntry info to decide whether to ask for password" into mainOleg Kibirev
2023-11-29Merge "Remove reference to EXTRA_SLIDER_VALUE" into mainAnton Hansson
2023-11-28Merge "Fetch admin details if not present in Intent." into mainTreehugger Robot
2023-11-28Use WifiEntry info to decide whether to ask for passwordOleg Kibirev
BUG=305092860,153627947 Change-Id: I141d9b47720fe8adfff6a404de3c3e5d9967117d
2023-11-27Fetch admin details if not present in Intent.Ayush Sharma
Get admin package/user details if this info is not present in the intent(ACTION_SHOW_ADMIN_SUPPORT_DETAILS) received Bug: 192245204 Bug: 308520120 Test: atest MixedDeviceOwnerTest#testCreateAdminSupportIntent atest MixedProfileOwnerTest#testCreateAdminSupportIntent atest MixedManagedProfileOwnerTest#testCreateAdminSupportIntent Change-Id: Idda6078a64c03588f0b786ebc79079198ab722fe Merged-In: Idda6078a64c03588f0b786ebc79079198ab722fe
2023-11-25Fix ClearDataCachedPreference in single panel settings (ATV)Gregory Montoir
The previous code was relying on Fragment.instantiate that would not set mOkListener. getFragment now returns null in ATV mode, and the confirmation fragment is now explictely started in onClick. Bug: 312597047 Change-Id: I85f2bed363ca284a0532eeadbbcb9d7f32a91402
2023-11-23Remove reference to EXTRA_SLIDER_VALUEAnton Hansson
It has no effect, remove it. Bug: 155877914 Test: m Change-Id: I7fd276b7d247f935b13120ec35b4b72dbad06ea7
2023-11-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0df65b9a0926db69c7146b698c3692a70ffcbc21
2023-11-17Display Mac address of active network interface in Settings/About/StatusOleg Kibirev
This can be a Wifi or ethernet connection Bug: 286409648 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36df96c97ab79f9248b38a1aaa1f265544734932) Merged-In: I46a25eeee97040c28724830d2a390ef50d623075 Change-Id: I46a25eeee97040c28724830d2a390ef50d623075
2023-11-16Merge "Fix Learn more link placement is wrong problem - Use the new style of ↵Treehugger Robot
the FooterPreference." into main
2023-11-16Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-11-16Fix Learn more link placement is wrong problemeric_kuang.rs
- Use the new style of the FooterPreference. Test: Manual test CTS Verifier: com.android.cts.verifier.managedprovisioning.EnterprisePrivacyTestListActivity#Add account disclosure Bug: 271956998 Change-Id: Id1721c53ece12d4dea71a675ebf4860328a3d8c7
2023-11-15Merge "Use commitAllowingStateLass in Wifi settings" into mainTreehugger Robot
2023-11-15Merge "Proxy FIND_MY_REMOTE pending broadcast" into mainPhilip Junker
2023-11-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I41de27b52ed691fc34c9afcfe28a90c7c9b54ada
2023-11-15Use commitAllowingStateLass in Wifi settingsOleg Kibirev
Bug: 306582829 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ddaba049d3bf91b166b4684a531d5248efd9ccaf) Merged-In: I5a3cb0ef85119dc3ddbddb0cbbcbfdd627cfccaf Change-Id: I5a3cb0ef85119dc3ddbddb0cbbcbfdd627cfccaf
2023-11-14Show the Add Account sign on the Accounts & SignIn pageOindrila Dawn
Bug Id: 308542988 Test Image: https://screenshot.googleplex.com/GamLSXUZHABe3qG Change-Id: I072350c47b0e3be0ee73d6cbbb02180cf936c9d5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 18:25:45 +0000