PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,217 Commits 1 Branch 0 Tags
ad5b6855db9752327f182a3dddeef32e84cb9bcc
Commit Graph

117217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
693ce48efb Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 15:18:57 +00:00
Treehugger Robot
1f9c4c483a Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 14:49:24 +00:00
Treehugger Robot
4378ee11ad Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" 2022-09-09 14:20:05 +00:00
Chaohui Wang
af40681610 Merge "Clean up some UnusedResources detected by lint" 2022-09-09 12:51:49 +00:00
Chaohui Wang
28d838d5e7 Clean up some UnusedResources detected by lint 
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2ad634d9beba623a5cdcff015c9aa28d78525cb7
 2022-09-09 16:51:12 +08:00
Zekan Qian
d9fff4beac Merge "Add param name when use SettingsEntry.createInject api. Use SettingsPage.create api to create SettingsPage. Remove debug button in HOME page." 2022-09-09 08:29:56 +00:00
Chaohui Wang
03933264d6 Merge "Clean unused plurals" 2022-09-09 08:04:58 +00:00
Chaohui Wang
d22619e995 Migrate UsageStats to Spa 
The UsageStats page is for testing only, cannot entry through Settings
Home, but is accessible by enter *#*#4636#*#* in dialer.

Migrate UsageStats to Spa for both improving the UI & performance.

Fix: 244675756
Bug: 235727273
Test: Manual with Settings App
Change-Id: I6ec6e233075a3f79ac1231aecafabf2a71dac716
 2022-09-09 16:00:41 +08:00
Binyi Wu
9bc7ebca6e Merge "Revert "Update capitalization of preference in app info All Services -> All services"" 2022-09-09 07:14:34 +00:00
Grace Cheng
f15c726127 Update SFPS enrollment education assets and add light/dark theme colors 
Updates SFPS enrollment education layout and adds new assets indicating
sensor location in each orientation. Also defines color codes and adds
LottieColorUtils to dynamically map LottieAnimationView colors from light/dark theme

Test: Observe correct assets during enrollment in all orientations
Fixes: 242074146
Fixes: 238596925
Change-Id: If3b7502350057cc9b04f12aa9a5b36be06958630
 2022-09-09 07:09:27 +00:00
Eghosa Ewansiha-Vlachavas
b03d10985e Merge "Update DPM.setProfileOwner call in DeviceAdminAdd" 2022-09-09 06:53:34 +00:00
Binyi Wu
4f536bf14c Revert "Update capitalization of preference in app info All Services -> All services" 
This reverts commit 96f95e7c6f.

Reason for revert: DroidMonitor-triggered revert due to bug b/245852321

Change-Id: Ib9ba70779b6e961e945dd9de0ce83c5244cb158d
Test: presubmit
Bug: 245852321
 2022-09-09 06:26:43 +00:00
Zekan Qian
6243eb3ec9 Add param name when use SettingsEntry.createInject api. 
Use SettingsPage.create api to create SettingsPage.
Remove debug button in HOME page.

Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I59b6f4c0ead0b3f0dc06eb238b074d2cf91cf74c
 2022-09-09 14:23:35 +08:00
Chaohui Wang
5ef8a39dd3 Clean unused plurals 
Bug: 199230342
Test: Make Settings App
Change-Id: I6d5d97285b9721c390036a10ad36f2dae46e1818
 2022-09-09 13:19:17 +08:00
Shen Lin
78fc8a21a4 Fix potential NPE crash in ConversationHeaderPreferenceController 
mChannel is nullable and we have to do a null-check before calling its method.

Bug: 245506600

Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
 2022-09-09 10:16:29 +08:00
Chaohui Wang
e68cf6df7d Merge "Clean unused image files" 2022-09-09 01:29:42 +00:00
Chaohui Wang
c613009cc2 Merge "Clean unused string arrays" 2022-09-09 01:24:19 +00:00
Bill Yi
6365319bf1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours am: 89fe1313c2 -s ours am: 727d0996d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e34a4b9dda0fd641e1fe34f6a6811ba43fb649e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 00:10:39 +00:00
Bill Yi
900692958d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours am: bbd35cbe45 -s ours am: dd03237f19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1df509548c1f893021d52ce986855708f27e2250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 00:10:27 +00:00
Bill Yi
a4b7b25bc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours am: 19640b0bc2 -s ours am: 62366cdf2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f27aacc2581732bf129876ed0bbe98dd972d18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 00:10:06 +00:00
Bill Yi
64da2c1493 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours am: 6b4251e977 -s ours am: 181f1ecf60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I533f53b120bf2609d4ea8853ec65c6e19bcec1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 00:09:44 +00:00
Bill Yi
727d0996d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours am: 89fe1313c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26f0c2a5006ee63311646149ef7309e6aa09f31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:46 +00:00
Bill Yi
dd03237f19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours am: bbd35cbe45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ad37af98d3167b1579cbe7dcc67af524b750044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:32 +00:00
Bill Yi
62366cdf2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours am: 19640b0bc2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic717761fc4984877e7ee1c7c8f9fabdf96072ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:12 +00:00
Bill Yi
181f1ecf60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours am: 6b4251e977 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c16a47156e438351ebe617036af4cda02b793ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:22:49 +00:00
Bill Yi
89fe1313c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic78f0dbf0eb4e14f8c10855fbd7219f70d315b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:30 +00:00
Bill Yi
bbd35cbe45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f20fbccb440dce4ae45998ab8714310476a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:12 +00:00
Bill Yi
19640b0bc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f4ced9ea0c104aeabf97c3b7f1634aecda90330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:51 +00:00
Bill Yi
6b4251e977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d399648536010692a04b480678a24e5cbbd58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:44 +00:00
Rambo Wang
6058f97f9b [automerger skipped] Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304ab am: c21d77b724 -s ours 
am skip reason: Merged-In I4a2ec44092804574a60113e5be3df19b586bfa64 with SHA-1 17a9fb6bec is already in history

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

Change-Id: I7a2009efe8aeffd69032e29ea81dc111aaadae04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:56:07 +00:00
Rambo Wang
c21d77b724 Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885633

Change-Id: I7b90423f637140df909eedc024a801d700148e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:23:55 +00:00
Bill Yi
4ad699717a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic565c19863d34961aef5dcce39ade416e816fcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:50 +00:00
Bill Yi
f1d8ba94d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5c0d891ea8d91e1e1c1868e90456ff59947772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:36 +00:00
Bill Yi
28d6d5a7c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:05:54 +00:00
Bill Yi
158bf69a42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77337c147a9468ff174fd851e58cb968723b3203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:13 +00:00
Bill Yi
19de182abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:01 +00:00
Bill Yi
5f1549cee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:17 +00:00
Rambo Wang
31cd5304ab Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev 2022-09-08 21:57:11 +00:00
Bill Yi
976f702727 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
09b685534a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
042554a0e4 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE 
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
 2022-09-08 14:23:20 -07:00
Ganesh Olekar
96f95e7c6f Update capitalization of preference in app info All Services -> All services 
Bug: 244216312
Test: Verified manually
Change-Id: Ie3be9b4519ec070fe82fd43893d53a3d7fd7ada6
 2022-09-08 21:11:31 +00:00
TreeHugger Robot
d7d4d9db50 Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" 2022-09-08 17:18:16 +00:00
Chaohui Wang
67078e43bd Clean unused string arrays 
Bug: 234570979
Test: Make Settings App
Change-Id: I5478bb88a046a21b410283140a35b3931d4c9635
 2022-09-08 20:18:56 +08:00
Chaohui Wang
b41fd3afc2 Clean unused image files 
Bug: 234570979
Test: Make Settings App
Change-Id: I961d508bc1ee1352b6bf5e9efce9cba7efb40696
 2022-09-08 19:40:59 +08:00
Stanley Wang
0b72d620a3 Send pre-index intent when developer options changed 
Bug: 244521263
Test: manually test and review UI
Change-Id: I410dcc8ac8a9e131357a3e186e17b0d6363ad247
 2022-09-08 17:00:24 +08:00
Milton Wu
4f93ef7790 Fix incorrect choose screen lock during unicorn 
ChooseLockGeneneric uses intent extra key to determine correct strings
on "Choose screen lock" screen.

Bug: 219419005
Test: atest BiometricEnrollActivityTest
Test: Manully test SUW as following combinations
      1. W/ unicorn flow or W/O unicorn flow
      2. Fingerprint only devices or Fingerpirnt+Face devices
Change-Id: I2abf9555676f3fb3b92dd6ddcc091ea8158bfe9f
 2022-09-08 07:54:53 +00:00
Shen Lin
e960694a15 Fix compile warnings due to non-varargs call of varargs method 
Bug: 245384099

Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
 2022-09-08 07:02:52 +00:00