PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,853 Commits 1 Branch 0 Tags
4e3f5c92535b675dc73b372a76681ab098cfb9a8
Commit Graph

102853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4e3f5c9253 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I9d3a483b648c9a8f55943c18e5388541a3749abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:51 +00:00
TreeHugger Robot
5a083d2bfe Merge "Change the alignment of the foreground preferernce controller" into tm-dev 2022-04-26 05:44:37 +00:00
TreeHugger Robot
62b2539aae Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Icd32bbd11e1bcd24503b59659d05d4c3484bf0af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4 Merge "Allow intent into Privacy Controls page" into tm-dev 2022-04-25 18:09:39 +00:00
Jan Tomljanovic
70c4143751 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I08a4ffc1e1c0c4b71a3a2292c58e9545e3bf3b36
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:01 +00:00
Jan Tomljanovic
e22fa138aa Merge "Don't show back arrow in Security when in split mode." into tm-dev 2022-04-25 13:52:31 +00:00
Betty Chang
38ca4482f7 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I89b3eaa44f88f4a3a86eeb295e3760446f115a5e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 10:55:28 +00:00
Betty Chang
662a45bc0a Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev 2022-04-25 10:39:42 +00:00
Jan Tomljanovic
ef817325bc Don't show back arrow in Security when in split mode. 
Test: manual
Bug: 224427042
Change-Id: I0b0daa3981c56ba99bebda2cd34a51f3877f37a6
 2022-04-25 10:37:55 +01:00
Jason Chiu
286048f638 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Ie8eceb4941bd4775994b9fe2e5d640a1fda978fa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 08:45:51 +00:00
Jason Chiu
346a40a6f5 Merge "Relaunch the account page after removing a work account" into tm-dev 2022-04-25 08:28:43 +00:00
SongFerng Wang
a7a5061f08 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: Iaea308bce7c671764a8a8922cd7559849f253d5b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 07:48:48 +00:00
Prabal Singh
9fa00378f7 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: I367725b607bc93181341a14a06d376ef50f59521
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 07:48:39 +00:00
SongFerng Wang
564c88485a Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev 2022-04-25 07:40:43 +00:00
Prabal Singh
591c2c3b38 Merge "Use settingslib util methods for work policy info" into tm-dev 2022-04-25 07:33:09 +00:00
Jack Yu
bf3a207fb5 Change the alignment of the foreground preferernce controller 
Set left align to the nfc foreground preference controller.

Bug: 223073535
Test: manual
Change-Id: I0d4ffcedb2646b9d3fd7f4d56adb0d000cfd5987
 2022-04-25 15:27:05 +08:00
Jason Chiu
9c1a1cb884 Relaunch the account page after removing a work account 
Removing a work account goes back the previous page.
However, this closes Settings app in dual pane mode since the account
page is in the 2nd layer.

Bug: 223755141
Test: manual, robotest
Change-Id: I40407cb052c0474f62254bcb2216e33496c901c8
 2022-04-25 12:39:51 +08:00
Arc Wang
fec02dd404 Fix 'Documents & other' missing problem am: 03b1b23c74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: I5cd5ff4c3c8a5a00a9e286d6f831c82812f91366
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 03:53:06 +00:00
changbetty
d1d9798a5d [LE Audio] Add entry point in Media Volume slice for broadcast sink 
Bug: 228274114
Test: make RunSettingsRoboTests
Test: Manual test
Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff
 2022-04-25 02:42:46 +00:00
Arc Wang
03b1b23c74 Fix 'Documents & other' missing problem 
Should check if 'Documents & other' is visible
when mVolume is updated.

Bug: 230215783
Test: manual visual
      Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
 2022-04-24 15:30:16 +08:00
Bill Yi
eec01885fe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Bill Yi
f5ea12c99d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info 
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
 2022-04-23 20:35:41 +01:00
Nate Myren
d1749cfbab Allow intent into Privacy Controls page 
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
 2022-04-22 13:58:50 -07:00
Ricky Wai
3ab907b968 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I6a88065f868d567bd7771a8e44ac65e23ee12999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 15:18:19 +00:00
Ricky Wai
fd7153ed39 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev 2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready 
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
 2022-04-22 19:28:13 +08:00
TreeHugger Robot
2b2fab41f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I52f5e12c78b60eccf6adde49a51b7cde996b6d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:18:41 +00:00
Bill Yi
52294cceea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I7306e7016fe40a97f23d2072b657112e1a83a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:18:24 +00:00
TreeHugger Robot
7d5cc42c81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 07:52:01 +00:00
Bill Yi
77893f9b81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663

Change-Id: I837f50c29d924b84ae438fd630813338a0d50e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 06:20:10 +00:00
Bill Yi
772186e057 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663

Change-Id: If2a2da1244c5302bc3421db1a5570cb5a674cffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 06:19:42 +00:00
Bill Yi
cfd4e0e395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668

Change-Id: Ie301565e0ffb8d2630c42235d47c1afa64e85be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 06:19:17 +00:00
Bill Yi
602b5c15c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668

Change-Id: Id0b0a3aa83056874bec89d994838716846914c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 06:18:57 +00:00
Bill Yi
bfd3ced372 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 06:17:37 +00:00
TreeHugger Robot
df93d794dc Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: I18251815257f45eccb7e02d3b20c103272007201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 06:07:43 +00:00
TreeHugger Robot
49cc66afd3 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev 2022-04-22 05:50:05 +00:00
TreeHugger Robot
226baf6f25 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
Chaohui Wang
78e47ccfa1 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I688bfcc7872b7865631e9f96ecffe02bc16f9d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 02:44:52 +00:00
Stanley Wang
a5bc0fd0db Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: I9eaec2b8a7cc4ff7838f259e4c059b3be52fba45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 02:44:09 +00:00
Chaohui Wang
932d5deaff Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev 2022-04-22 02:15:23 +00:00
Stanley Wang
2e2a484a88 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev 2022-04-22 02:08:12 +00:00
Bill Yi
fba53c2569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819

Change-Id: I05e379c071f17ba69facf60f301a46a5e9a018e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 22:20:51 +00:00
Bill Yi
e2f0df2e2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819

Change-Id: I3b7bd4377446fe3aa6ff6f45ffeabbec177f243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 21:52:59 +00:00
Abel Tesfaye
8814d96884 Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver 
Controllers are automatically bound to a lifecycle if registered in the xml file. Manually binding a lifecycle can cause multiple receivers to be unregistered/registered. Removing the manual binding will prevent this case from causing a potential exception.

Bug: 227762968

Test: none
Change-Id: I9c8ddc6f82b19cd4a9c8a4aec3c9c744935cd542
 2022-04-21 21:31:03 +00:00
Bill Yi
6fcdbbeac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819

Change-Id: Iccbbd4929788c7a64c6b3aeb9a318684054eb07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 21:29:09 +00:00
PETER LIANG
8242402834 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: I4de70cc4063af21a3263c0a0e5f32e10912241b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:19:19 +00:00
PETER LIANG
8c78bad4e6 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev 2022-04-21 16:06:44 +00:00