PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,038 Commits 1 Branch 0 Tags
37bae5ee088cc33cf9c84d7332985f18a4461bf9
Commit Graph

111038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
4076fea0ca Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id9d4b1127d0ce707f97a0ee55bfb736f6f3ad979
 2022-12-03 11:55:52 -08:00
Bill Yi
1eee9788bd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I956252050d37d066f5b03c78321b60b4582e8307
 2022-12-03 11:42:11 -08:00
Bill Yi
77827ac6f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8d5d5c19dd13d77dc849aaba050134b5fe4415a
 2022-12-03 11:40:56 -08:00
Bill Yi
8a702ea7b1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0775c4d7fba47cd1cf4259bf7b1dcb58b79a1eb9
 2022-12-03 11:38:04 -08:00
Grace Cheng
b7eef9c024 Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647

Change-Id: I97b0ec97c73a85e28f3bb4eaa05d59441188a404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 06:10:58 +00:00
Grace Cheng
ebda524556 Removes duplicate SFPS string and updates references am: 0d74f4b755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647

Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev 2022-12-03 05:37:34 +00:00
Alejandro Nijamkin
f31108f11a Specifies nav destination when opening shortcuts. 
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.

Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.

Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
 2022-12-02 16:08:32 -08:00
Grace Cheng
0d74f4b755 Removes duplicate SFPS string and updates references 
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message

Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
 2022-12-02 23:50:37 +00:00
Dmitry Dementyev
96999068e9 Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506

Change-Id: Ifcc84304cf3d8a69069792a9d1ace64187f125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 20:05:16 +00:00
Dmitry Dementyev
71dd4b23e8 Merge "Show account name as a single line string." into tm-qpr-dev 2022-12-02 19:30:59 +00:00
Tom Hsu
9ad53e4e89 Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 am: 916110007d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: I2d1c10ec2cac55485987ac2f5daf38c001800b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 08:12:47 +00:00
Tom Hsu
916110007d Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9 Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" 2022-12-02 07:16:28 +00:00
TreeHugger Robot
ccba0e07ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 86efc1e18e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id42d6535c3b219d289fa4e9bf2739f8839a44834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 01:26:12 +00:00
Bill Yi
ba6987b817 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e80f3b385 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97f06867b4319a6a0183479dae02753495b3f50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 01:25:54 +00:00
TreeHugger Robot
4b83349d05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 42468bf0c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5c324e54bcf0eb4c5824c38def999c1077b46b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 01:25:34 +00:00
Bill Yi
c0b92c74d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b52c4b62c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36708423c3952486150b396b8a0f2fa40dac6bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 01:25:10 +00:00
TreeHugger Robot
86efc1e18e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-02 00:50:39 +00:00
TreeHugger Robot
42468bf0c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-02 00:50:39 +00:00
Edgar Wang
49cd8d88d1 Avoid media transcode can be bypass guard of developer options 
When developer options switch is off, a user including guest user
can still configure media transcoding settings via slices.

Bug: 244569778
Test: manual
Change-Id: I3d70045c2498e683bf615cbe521e2f98d50b7eec
(cherry picked from commit a94e8d0bc7)
 2022-12-01 12:25:31 +00:00
Wesley Wang
ada410afbe Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev am: 1f139628b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821

Change-Id: I97e0f4e61b4208ede2e138c55a5747be9008ef04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 07:04:13 +00:00
Wesley Wang
1f139628b3 Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev 2022-12-01 06:30:10 +00:00
TreeHugger Robot
de5e399778 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours am: 06b7aa4774 -s ours am: 04837d7a5e -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I593f31d55f319f6f06a0a78823820d82b44b1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 04:14:57 +00:00
Arc Wang
48166d608d [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: f35358a5ec -s ours am: dd065b488c -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I0344ddf46512844865fd628c4da0fedc1f730832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 04:14:48 +00:00
TreeHugger Robot
04837d7a5e [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours am: 06b7aa4774 -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ia96d55c64aba6d99e977270dc9a2f93fdf07823b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 03:37:49 +00:00
Arc Wang
dd065b488c [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: f35358a5ec -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I657a5ceff11a3a0b9d895111306e24de95afb49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 03:37:46 +00:00
TreeHugger Robot
06b7aa4774 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I7b0f9a99ad886490c7a2a28a80fdefd1c00b4995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 03:11:15 +00:00
Arc Wang
f35358a5ec [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I5422c2f01dea4a60d3ff0677d167d050fd2efd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 03:11:13 +00:00
Arc Wang
fb7ff5c75a [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev am: 252bf820ee -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ib6050754c0d8712c5e9c25ff94f2d760a2ce9d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 02:33:51 +00:00
Arc Wang
97fdb8a7a2 [automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad94a -s ours 
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I7d301044893e7ceb9f94c8593946ddba329489e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 02:33:46 +00:00
TreeHugger Robot
7aade1aced Merge "Settings 2-pane deep link vulnerabilities" into tm-dev 2022-12-01 02:31:14 +00:00
Arc Wang
252bf820ee Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev 2022-12-01 01:45:56 +00:00
Joshua Mccloskey
88c9b00bac Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595

Change-Id: Ic81bafc8063bba1e65eef7729001556e8a330247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:27:36 +00:00
Ale Nijamkin
2a557b75fe Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947

Change-Id: I0c201a2a1fd594d81162c9e84fe5c775e602e5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:26:37 +00:00
Joshua Mccloskey
1dd3fefa93 Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev 2022-12-01 01:02:40 +00:00
Ale Nijamkin
d81ae0a645 Merge "Brings back "Control from locked device" setting." into tm-qpr-dev 2022-12-01 00:50:42 +00:00
Wesley Wang
0c5e243f35 Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820

Change-Id: Icd0d4853960504be5e6c358ab76af84bae752df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 17:21:44 +00:00
Wesley Wang
eb565adf5d Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769

Change-Id: I5944ee42fe0e6da8a3e3a815ec3cebbabb79b155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 17:21:36 +00:00
Wesley Wang
2d30eaa3bd Merge "Clean up useless defender dialog code" into tm-qpr-dev 2022-11-30 11:57:01 +00:00
Wesley Wang
f218f350c4 Merge "Add dock defender battery tips" into tm-qpr-dev 2022-11-30 11:57:01 +00:00
Arc Wang
69b16997a7 [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours am: b7b0658ebd -s ours am: 9a21435d4e -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: I6554d137907046d0678201c97e70f1798a79353d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 10:36:33 +00:00
Arc Wang
9a21435d4e [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours am: b7b0658ebd -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: I99994909674e5ac279c3b59508b74c99aac07d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 09:57:46 +00:00
Arc Wang
b7b0658ebd [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: I3aac14cfd7983d08532721f61a339cc91fb249fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 09:30:44 +00:00
Bill Yi
4e80f3b385 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81ea11753d22cdf529542426f7bb8c1e86fd43c5
 2022-11-30 01:27:48 -08:00
Bill Yi
5b52c4b62c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f7614bcc8efb3cde868b81a72832adbe2a37958
 2022-11-30 01:21:58 -08:00
Arc Wang
7c1b458844 [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: I30fbaf04797eb75d3d544870af8613436ea85726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 08:48:47 +00:00
Arc Wang
434c8934c4 Settings 2-pane deep link vulnerabilities 
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
   start the deep link Activity.

Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
 2022-11-30 06:09:43 +00:00
Treehugger Robot
a7efff1ddb Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf am: 71a123db03 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227

Change-Id: I5483d044093d711f6f521fc9cdd738dc9638c0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 00:38:11 +00:00
Joshua Mccloskey
a2133c2b00 Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." 
This reverts commit 3ca9965a96.

Reason for revert: b/259709482

Change-Id: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
Merged-In: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
 2022-11-30 00:31:23 +00:00