PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,442 Commits 1 Branch 0 Tags
35b51c6a87be46e146536bf72d75d1f91bb7bd6e
Commit Graph

104442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salud Lemus
86b967bcb8 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: If1b6b8a739d597a4acebf6324eb952d339ae9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 22:48:17 +00:00
Salud Lemus
bb149294dd Merge "Fix title used for financed device info in Settings" into tm-dev 2022-06-22 22:33:18 +00:00
Bonian Chen
d1e0f81da1 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I0913549f6c94ddb994092377f2be48d3e7641d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:24:43 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
930ccdecef Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ic6317a7cc2f0355a2c94ffddd200b7d489d54d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:44:34 +00:00
Oriol Prieto Gascó
d6166e42a0 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev 2022-06-22 17:18:45 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app 
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
 2022-06-22 07:51:47 +08:00
TreeHugger Robot
197a73362f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 18:31:49 +00:00
TreeHugger Robot
ec1cd45fbb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 18:31:49 +00:00
TreeHugger Robot
159ce975f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85265a3d481d97643770d3bac5a8e766809cb0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:40:03 +00:00
Bill Yi
cedcc21b03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idaf6f1a8fe5ba4f96110c376a32c5564e7a01bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:56 +00:00
Bill Yi
85a4b5b105 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee82cadd6e1b26834e40662916f7e208b36843fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:49 +00:00
TreeHugger Robot
d9fba9380a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
Bill Yi
1b92a98891 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6239cc468a57eec0e714dab336bf2a913b54267e
 2022-06-21 04:15:29 -07:00
Bill Yi
fabd8de898 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99e5ebe3a8c58c3c9dd9ba74a3081aed861c859b
 2022-06-21 04:11:01 -07:00
Bill Yi
e0f4db7fa9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib2aff8ba61f93ad3faca8150efe2f588e51e5735
 2022-06-21 04:07:41 -07:00
Bill Yi
aec918fd54 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6b3b59a119efaffac2323b7595e0b2107d9b445
 2022-06-21 04:03:08 -07:00
Bill Yi
02c97733ec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 02:31:30 +00:00
Bill Yi
7c822b7534 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac95f3f35ee3d4507c75472ab5b64425f8869236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:33:48 +00:00
Bill Yi
acfe8e05d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f71c7e4723b674fdd5c02c5426584ac4e4db8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:30:02 +00:00
SongFerngWang
07a37c3170 Fix the NullPointException am: 5a4df243f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

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

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

Change-Id: I10ea6e14ee85058126a4fedee4265fd4b651e4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:24:43 +00:00
Oriol Prieto Gasco
f528e7de49 Use com.android.bluetooth as the BT stack APK 
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
 2022-06-19 23:06:06 +00:00
Bill Yi
e00a15d95f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
 2022-06-18 19:47:16 -07:00
Bill Yi
980d88cc0d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e73269e1f3bd05c9ffbeb56659b9d1bac5aad55
 2022-06-18 19:20:22 -07:00
Bill Yi
2ad6b3dc50 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b9f222ff3b5267dfcd3b94da51f1a022ea5f87c
 2022-06-18 19:02:00 -07:00
Bill Yi
49b4ab94b7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f85c7cccfc1b44e604611c4499245812136ea1d
 2022-06-18 18:57:39 -07:00
Salud Lemus
a1df448703 Fix title used for financed device info in Settings 
The title for the financed device info page in Settings changes to
"Managed device info" instead of "Financed device info"

Bug: 236259020
Test: Manual test

Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2
 2022-06-16 19:32:14 +00:00
SongFerngWang
5a4df243f0 Fix the NullPointException 
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.

Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
 2022-06-16 10:46:07 +08:00
Jason Parks
5c4943cc93 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: Ia63d08e0ece9f00930d5acd1569bfcfe6a10e597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:13:51 +00:00
Jason Parks
73276b3c91 Merge "Use API to check for the superivion component." into tm-dev 2022-06-15 12:54:00 +00:00
TreeHugger Robot
2133a3d676 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-15 06:32:13 +00:00
TreeHugger Robot
858f84503c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib455218f3767a9d85e17d61f88392ad2c384551d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:54 +00:00
Bill Yi
52c93abc11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If99802e1d0fba3c1d3ed91308059ada9ccaf7281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:42 +00:00
TreeHugger Robot
50a74572fc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-15 05:25:34 +00:00
Jason Parks
4a9c108b28 Use API to check for the superivion component. 
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
 2022-06-14 17:16:07 +00:00
TreeHugger Robot
8d3f1ccf73 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I4af9e6e5ccb9a8ceadcfa188af936e412a3849fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 03:25:56 +00:00
TreeHugger Robot
c45731efdb Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev 2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5 Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link 
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.

Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.

Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
 2022-06-14 02:45:49 +00:00
Bill Yi
f68acfb73e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18a9ac4db3be35e4b643a213c8635b1b22a2bec8
 2022-06-13 16:26:38 -07:00
Bill Yi
8725c56c1b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4d9f0500b7e7e80f5187754cdff8bac941064dc7
 2022-06-13 16:18:54 -07:00
TreeHugger Robot
668d6e9451 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Iacdfbb0bb0b576abdd25e2f461ed9c78cf5fcba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 18:30:18 +00:00
TreeHugger Robot
e058aae3cd Merge "Add "smallestScreenSize" into homepage activities" into tm-dev 2022-06-13 18:11:22 +00:00
TreeHugger Robot
d097786212 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide1d6d3ff05f8e4775f4e58da156705702f567d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:14:00 +00:00
Bill Yi
89c2a974eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f0be334ea87854e08fd4212c4330e27e7b87d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:13:45 +00:00
Bill Yi
49df98360d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29999c75226c3b1d9d98574e357e5b082abcedb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:13:29 +00:00
TreeHugger Robot
e5a507e23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:04:36 +00:00
Bill Yi
61dfaa8065 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92d57e34cbab0f19fef55c4de966de3495aae4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:55:27 +00:00