packages-apps-Settings

Fork

Avoid crashing in eng build

A workaround suggested in https://issuetracker.google.com/issues/66066209

release-request-49e3b466-076f-42b5-804c-ed9aab783aec-for-git_oc-r5-release-4255676 snap-temp-L37500000092850661

Change-Id: I9ef291e8d9e30ff55765c2e84541b6f82294d133

Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, 2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release

Change-Id: I9852c1e83840cfcae835ac8d0b4a421b1e88277a

Import translations. DO NOT MERGE

Change-Id: Id14cb0db11124188371e8ade4d82ed1e62022ee0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
(cherry picked from commit 532a12a99c5da7832d60f197ef4d86f0b2ebbef1)

Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280, 2461290, 2461342, 2461291, 2461216, 2461217, 2461304, 2461306, 2461381, 2461307, 2461234, 2461195, 2461308, 2461362, 2461235, 2461218, 2461363, 2461323, 2461382, 2461345] into oc-release

Change-Id: I41ffea35b71cecdccc6230a8b3ec03066d469e7f

Import translations. DO NOT MERGE

Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
(cherry picked from commit 8ec66e1f5650e08989d20964442c8b77d261d73f)

release-request-160c4b31-7fa0-4e2b-aabe-85380836a1ce-for-git_oc-release-4129081 snap-temp-L15300000077039010

Change-Id: Ie605d70e3ef05f335e2fe025af5640300688d3e3

Count cache in storage categories.

This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).

Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test

Bluetooth: Make notifications local-only

This will prevent them from showing up on external devices where they
would be less than useful.

Test: connect to watch and pair a device
Bug: 34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit 426903d155a0e9089666736e784d498e6a016845)

release-request-767e2998-9243-43e0-b656-1acb30ac5115-for-git_oc-release-4124637 snap-temp-L74200000076595014

Change-Id: I17e75290350a2c3aee6f262414fc552134404f03

release-request-5bf29450-4eb0-4d71-a15a-d8858bf184d3-for-git_oc-release-4120128 snap-temp-L37600000076154351

Change-Id: I166ece1806d7a01d6b24f28918c5703c57195366

Import translations. DO NOT MERGE

Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import

Merge "Hide wifi and bt in battery settings" into oc-dev

Hide wifi and bt in battery settings

Hide them in app usage list but don't smear them

Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef

release-request-8a29fe1b-a466-48e3-824a-9b3737e5c08a-for-git_oc-release-4115999 snap-temp-L30600000075741665

Change-Id: Icc907e130cac658a18f2d1ff9be7526a417425c7

Merge cherrypicks of [2429785, 2429786] into oc-release

Change-Id: Ibc8b0ff54a0bf3de6a54863431d1437014bc8b47

Add more sane multi-profile app attribution.

Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.

By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.

Bug: 62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180
(cherry picked from commit b088010d12bdb709fc1aa4269a86924aab58be47)

Merge "Add more sane multi-profile app attribution." into oc-dev

Merge "Notification settings update." into oc-dev

Notification settings update.

- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.

Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29

Merge "Misc fixes for notification" into oc-dev

release-request-f4ecf242-5d1c-45e0-8c7c-ede48d1a9e82-for-git_oc-release-4111650 snap-temp-L02200000075283731

Change-Id: Id1d18af2ea581d110c1dd8118600f17ea37b5f46

Misc fixes for notification

- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header

Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix: 62138362
Fix: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java

Import translations. DO NOT MERGE

Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import

Add more sane multi-profile app attribution.

Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.

By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.

Bug: 62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180

Fix searching work app in settings NO PARTIAL RERUN

Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working

Fix: 62366873

Merged-in: I333372699b263d02cc4083289dc746c7aacd414d

Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79

release-request-bfd62fea-ae1d-4d0d-80fd-4ff0d407c488-for-git_oc-release-4102265 snap-temp-L40000000074340189

Change-Id: I8b537e130f6584fbdeec967c6fca35fc02d542c1

Merge "Allow WifiSettings to show old APs on app resume." into oc-dev

Allow WifiSettings to show old APs on app resume.

If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.

Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/2409026).

Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.

Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc

release-request-0b3ce0b0-0f38-494b-a590-b594ba11c2d2-for-git_oc-release-4098933 snap-temp-L41500000074000728

Change-Id: If75aace4b5bf7f9d62c3b09299507dad71c7abfd