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

26880 Commits

Author SHA1 Message Date
Sandeep Jawalkar
3279e1a211 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc am: aa0205daf9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I663ea43a6e1e06b456a5a024bc7773e10cd03a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 04:26:13 +00:00
sandeepjs
beab3c0d43 [Android U][eSIM] Modify esim and sim card strings as part of esim primary 
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126

Test: build
Bug: 257380320
Change-Id: If2183945054255d52e89a61a04db25edd725a73d
 2022-12-21 12:01:01 +00:00
Darrell Shi
2287f6e2e9 Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115

Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3 Change screensaver ctrlr to base pref ctrlr. am: 542644e83f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682

Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 08:23:48 +00:00
Darrell Shi
e722587923 Merge changes from topic "hub-mode-settings" into tm-qpr-dev 
* changes:
  Add top-level Communal settings.
  Change screensaver ctrlr to base pref ctrlr.
 2022-12-21 08:03:49 +00:00
Darrell Shi
65836b1e3d Add top-level Communal settings. 
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.

Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
 2022-12-21 04:10:56 +00:00
Bill Yi
0ce477d1b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-20 06:00:39 +00:00
TreeHugger Robot
d7cc9378fe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-20 04:59:24 +00:00
Bill Yi
481727404b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b1d66716be8ffc0eb82d1a335d2ba34c8b692d8
 2022-12-19 01:19:11 -08:00
Bill Yi
9e6d50beef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If0e669b10ec6165954a81fdd3e6917a8af5da2dc
 2022-12-19 01:17:55 -08:00
Bill Yi
b24f771519 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia5ff9bb6e4a078f53e5494afaec5b14ef42a3812
 2022-12-19 01:14:55 -08:00
Zoey Chen
c76250cd50 Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651

Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-19 07:04:37 +00:00
Zoey Chen
e99f20df58 Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev 2022-12-19 06:20:37 +00:00
Bill Yi
9020747917 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-17 01:44:00 +00:00
Darrell Shi
542644e83f Change screensaver ctrlr to base pref ctrlr. 
This change makes it that the ScreenSaverPreferenceController extends
BasePreferenceController so that it can be readily used and pointed to
from an xml file.

Bug: 261627295
Test: atest ScreenSaverPreferenceControllerTest

Change-Id: I95487f2f49a23422fff46f30b0cfa287582a547b
 2022-12-16 16:49:54 +00:00
Zoey Chen
e45ab97777 [Settings] Add search keywords for APN controller 
Screenshot: https://hsv.googleplex.com/4816766300585984

Bug: 254024521
Test: atest ApnPreferenceController
Change-Id: I219256efff8d5859d029b190bf2cc73b8e83a746
 2022-12-16 11:36:16 +00:00
YK Hung
e7ec6ee025 Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827

Change-Id: I7d3f436b5e7da6c380402014813d0233c55b0b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-16 05:24:33 +00:00
YK Hung
cf8ab7eef3 Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066

Change-Id: I271e279c86e90360b9fae18f96dc8c913f9f430f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-16 05:23:35 +00:00
YK Hung
c89f78c68f Merge "Update dock defender helper URL" into tm-qpr-dev 2022-12-16 04:52:18 +00:00
YK Hung
d388dc1809 Merge "Update string for all defenders" into tm-qpr-dev 2022-12-16 04:51:46 +00:00
Bill Yi
d66bae69fc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f902b8eb62ecf275d0b28869ee2fb7cad3c88e4
 2022-12-15 20:33:51 -08:00
Zhenwei Chen
35caf2ffb7 Update dock defender helper URL 
Bug: 261206713
Test: Unit test passed
Change-Id: I6a8489b7e1a54d2c1d88cf6b04c8d1a4c9c6c235
 2022-12-15 10:09:55 +00:00
Zhenwei Chen
1eea27ae82 Update string for all defenders 
Test: Unit test passed
Bug: 262508668
Change-Id: Ia0126f9761caa43d0746962a9bb77173e9f45ad1
 2022-12-15 05:31:18 +00:00
Bill Yi
b66bdeb77f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I57333cf8b71834cba7ad120d25795998abc7cb9a
 2022-12-14 12:52:47 -08:00
Diya Bera
c52d4922cc Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590

Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:37:51 +00:00
Diya Bera
2d343061d3 Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev 2022-12-13 21:15:08 +00:00
TreeHugger Robot
47302fda11 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:15 +00:00
Diya Bera
6b468377c1 Flicker in Fingerprint Enrollment 
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
Merged-in: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
 2022-12-13 18:17:23 +00:00
Yi Jiang
7075fd453d Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20696311

Change-Id: I8fb334d8ac3783286c3cce1df3bd5d2c83a92c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 17:06:07 +00:00
Bill Yi
4453455aae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I351b7072bcfca6b3bc3808c49290cdd9ef120670
 2022-12-12 16:59:11 -08:00
Yi Jiang
1145b26ac7 Creates a flag for auto-rotate with face detection 
The flag is enabled by default. And will be disabled on foldable
devices.

Test: locally
Bug: 236249360

Change-Id: I8c90533f6011531a4f00af5f2514579638604067
 2022-12-12 19:49:16 +00:00
Darrell Shi
ef4fb09916 Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706

Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 17:01:34 +00:00
Darrell Shi
7bae5625a6 Merge "Update screensaver preference summary when on." into tm-qpr-dev 2022-12-12 16:41:38 +00:00
Darrell Shi
d1f5edfc78 Update screensaver preference summary when on. 
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
Merged-In: I40483f266c42a6e49e513208ba513d469d67f85a
 2022-12-09 17:36:01 +00:00
Bill Yi
afd2a8e009 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb23f9583f98c120733cc0ba1ca621d39855d960
 2022-12-08 01:19:59 -08:00
Zhenwei Chen
a08c9db9f2 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640198

Change-Id: Ia70a664a5fecab8090739fb632987965d7eb1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:48:16 +00:00
Yasin Kilicdere
ee476cab18 Remove the fallback AddSupervisedUserActivity. 
Rollback the changes done in ag/16388725 and ag/16709333

Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"

Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439)
Fixes: 249057848
 2022-12-07 15:23:37 +00:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon. 
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
 2022-12-07 05:46:57 +00:00
TreeHugger Robot
1c6313d8c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-06 03:44:10 +00:00
Ale Nijamkin
092de727b9 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev 2022-12-05 19:38:16 +00:00
Bill Yi
1c80356b98 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
6ef73d18e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
8433161d48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie497d67fdc9024e2e54f7580b4fa83778c26e3f3
 2022-12-04 00:42:56 -08:00
Bill Yi
38cec4fba6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifd07a3fec3a401205811b8c013590b519469b78b
 2022-12-03 12:00:12 -08:00
Bill Yi
0aeba23203 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18da1a6fe2a305975c3960be278c69466fbd1e4a
 2022-12-03 11:58:48 -08:00
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
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