PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,606 Commits 1 Branch 0 Tags
daff8fb3eca0630f3323f63df49179df2ad31da6
Commit Graph

101606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinyi Zhou
ecada6d32d Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I6ecf3590d89223f062163a51a0f94f55902aaafd
 2022-03-24 04:59:43 +00:00
Jason Chiu
177573c892 Enhance Settings deep link transition 
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.

To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.

Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
 2022-03-24 12:42:01 +08:00
Xinyi Zhou
9badccfc9d Merge "Update API according to API council feedback" into tm-dev 2022-03-24 04:36:17 +00:00
Xinyi Zhou
e44aae5b29 Merge changes from topic "nearby_api_5" into tm-mainline-prod 
* changes:
  [automerge] Update API according to API council feedback 2p: ad5e65a338
  Update API according to API council feedback
 2022-03-24 04:36:17 +00:00
TreeHugger Robot
a6430837e8 Merge "Update multiple users strings" into tm-dev am: e741185e17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: Id7b8980f463d9e59eaaa09da41a4c223ef8ebbc6
 2022-03-24 04:23:00 +00:00
TreeHugger Robot
1b07340b6c Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Ia965d488a7663b586cbf8368e9d45c7f5995d2ca
 2022-03-24 04:13:02 +00:00
TreeHugger Robot
e741185e17 Merge "Update multiple users strings" into tm-dev 2022-03-24 04:05:07 +00:00
TreeHugger Robot
f4f09c446e Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod 
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
 2022-03-24 04:05:07 +00:00
Yi Jiang
8edf692915 Moves battery saver warning message below Screen Attention setting. 
Test:  make RunSettingsRoboTests -j40
Bug: 220252566
Change-Id: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
Merged-In: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
(cherry picked from commit 70128d9016)
 2022-03-24 00:41:03 +00:00
TreeHugger Robot
d6ca2dadf4 Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-23 23:33:50 +00:00
TreeHugger Robot
f6fb17fcb2 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" into tm-mainline-prod 
* changes:
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624
  Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings
 2022-03-23 23:33:50 +00:00
Lucas Silva
202f5716ca Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I6d4df023486a340b79527071523a0af82961d0cf
 2022-03-23 22:48:23 +00:00
Lucas Silva
7b9593761a Merge "Update screen saver overlay toggle description" into tm-dev 2022-03-23 21:56:59 +00:00
Lucas Silva
4cc583982b Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" into tm-mainline-prod 
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
 2022-03-23 21:56:59 +00:00
TreeHugger Robot
e9fae331a5 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic3909624df98329c215eb400aeee0d9d4838a0fe
 2022-03-23 20:14:25 +00:00
TreeHugger Robot
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +00:00
Presubmit Automerger Backend
39ef1579ef [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: Iff78a0cf3e065fc8261b67e94603084e863e206e
 2022-03-23 19:21:46 +00:00
Yasin Kilicdere
4564bce03c Singularization of duplicated multi user strings. 
Many multi-user strings were duplicated between SettingsLib, Settings,
System UI and Car projects. This CL removes those duplicates.

List of singularized strings: "Guest", "Remove guest", "Add user",
"Remove guest?", "Too many incorrect attempts...."

Bug: 191386817
Test: NA
Change-Id: I8d9629a1a9628cab9f049df84f706bd04ee75cc2
 2022-03-23 19:20:34 +00:00
Presubmit Automerger Backend
352f747f82 [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Bug: 123211155
Change-Id: Ie00fce7c07aec140dcf7598a4e31c46453a6ab3f
 2022-03-23 19:01:32 +00:00
Ayush Sharma
f1255b4298 Enable Encryption & Creds UI for Secondary users 
Bug: 123211155
Test: Manual,m -j RunSettingsRoboTests
Change-Id: Ic669102c72a5270423f000d5326b48c91901a0ed
 2022-03-23 19:00:34 +00:00
Xinyi Zhou
d883631dc5 [automerge] Update API according to API council feedback 2p: ad5e65a338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Bug: 225116248
Change-Id: I454e3e7139c3151bd2e5f1f1b0185f44c78d3306
 2022-03-23 18:54:23 +00:00
Xinyi Zhou
ad5e65a338 Update API according to API council feedback 
Test: built and verified logs
Bug: 225116248
Change-Id: I9e0f82446ddd80737b3ee5f92a1bbb1838eef30e
 2022-03-23 11:50:37 -07:00
Bill Yi
e2bd7d9886 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie196fdd648f8d7e1df21cd7323aa851d164db6c2
 2022-03-23 18:22:15 +00:00
Bill Yi
03a0e1f76e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6a955910c7423fd7969b75e6aba20c9f04628313
 2022-03-23 18:18:39 +00:00
Bill Yi
70d210b974 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1925648483a881594f948162c6167facdcc3b268
 2022-03-23 18:17:31 +00:00
Bill Yi
5a15b32995 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac 
Blank merge reason: commit message contains skip directive

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

Change-Id: I3a298ec797195f9f7240b4c51c26657d91f4e764
 2022-03-23 18:09:34 +00:00
Bill Yi
a2aacc0aac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifea2ae405190a88de4e795fd91ec426f7cea3be5
 2022-03-23 18:09:25 +00:00
Bill Yi
4f7405f4d8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33b6f6118cbf42a488e1369b41c7a87ab8e888cf
 2022-03-23 18:07:37 +00:00
Bill Yi
ab0bfefb6c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I58009fae8d10e23e7ebaec62817ebb90475c6d28
 2022-03-23 18:01:17 +00:00
Bill Yi
c2e03b0a34 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I04fa07dc7042775ce964d9d1e6a2af4d8b7cd12b
 2022-03-23 17:57:21 +00:00
Bill Yi
2aec804097 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I878477ca669ea08c234a859312994165fe6d6b4c
 2022-03-23 17:53:40 +00:00
Bill Yi
bb28476c84 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189 
Blank merge reason: parent was merged -s ours

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

Change-Id: I1474c1522055ed7c65cfdbaa8fabedb46776f044
 2022-03-23 17:52:19 +00:00
Bill Yi
d8a0564189 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 
Blank merge reason: commit message contains skip directive

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

Change-Id: I81351f8d440bef564488a48ff79712079ff9146e
 2022-03-23 17:52:07 +00:00
Bill Yi
ff73238f91 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic11d9411bd3dad03d1a8904cbaf97a6731adaa6b
 2022-03-23 17:51:54 +00:00
Matt Pietal
6a966b0aff [automerge] Update multiple users strings 2p: 296b904bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: Ib2e47960b4602cacf727f18d47fe405b850c3ef4
 2022-03-23 17:40:45 +00:00
Matt Pietal
296b904bf1 Update multiple users strings 
To match latest guidance

Bug: 219078700
Test: manual
Change-Id: Ieef884e046e1e1798cc98a553bcd902c1374d069
 2022-03-23 13:39:42 -04:00
Lucas Silva
072d2beb83 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c000b5d042373d8617f6648e4957dd7c57dd8f9
 2022-03-23 17:31:18 +00:00
Lucas Silva
0f29d1562d Update screen saver overlay toggle description 
Change-Id: I6baab768fd845211e0d0eaf98b6a59cff4e25832
 2022-03-23 17:31:00 +00:00
Kweku Adams
9b0a2c7612 [automerge] Update enable toggle processing. 2p: 058796b7eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Bug: 158300259
Bug: 189850067
Bug: 205624100
Change-Id: I90b5e133853d6521e6af5c0ee761e57f5ee37537
 2022-03-23 16:44:18 +00:00
Kweku Adams
058796b7eb Update enable toggle processing. 
1. Use a ContentObserver so the UI is always up-to-date.
2. Don't write a value when it would effectively be putting the default
   value and the current value is null. This allows us to have a "use
   default" option so that DeviceConfig can take over if a user ever
   resets to default settings.

Bug: 158300259
Bug: 189850067
Bug: 205624100
Test: manually toggle and look at logcat for expected values
Change-Id: I429977d37cd8afc2ce12b89cbac002503484ad7e
 2022-03-23 16:43:39 +00:00
Shivam Agrawal
5178f33861 [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Id63cfa4a0749f2471794046da1edf2cb0bd65a3d
 2022-03-23 16:34:17 +00:00
Shivam Agrawal
c39ddd2624 Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 
It failed with Resources$NotFoundException and it blocks
WindowManager extensions CTS tests, so ignore it at first.

Bug: b/213322133 b/216630912
Test: atest com.android.settings.deviceinfo.PublicVolumeSettingsTest
Change-Id: I6827344b5316a4e57302bfc2e7ec4cf3674d6990
 2022-03-23 12:31:28 -04:00
Yuri Ufimtsev
8e7599c129 [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Bug: 226105654
Change-Id: If1206914f684741e59e331f6d26a8fc5d7bfc528
 2022-03-23 15:47:02 +00:00
Yuri Ufimtsev
af22553089 Postpone getting Metrics Category until it is needed 
Test: manual

Bug: 226105654
Change-Id: I9473ddfd72e38bff4f93b43d539c467b2e13e258
 2022-03-23 15:41:54 +00:00
Ricky Wai
1aa790501f Update restricted setting dialog, unlock toast, and menu strings 
Bug: 224970895
Bug: 224992636
Bug: 224970884
Bug: 224988456

Test: Can see updated strings and toast in UI
Change-Id: I29e257fcc15310558ae8e56cbc51de3c874471ed
 2022-03-23 14:39:17 +00:00
changbetty
dacce1fae3 Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT 
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
 2022-03-23 13:38:46 +00:00
Chaohui Wang
ba394bec83 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I49044c2b8fd210d20ed6437f9e1cad0e081644fd
 2022-03-23 13:22:17 +00:00
Chaohui Wang
8ba7ed6451 Merge "Fix SetupChooseLockPasswordTest" into tm-dev 2022-03-23 13:09:19 +00:00
Lais Andrade
68d7b91bb1 Add summary to "Vibration & haptics" settings 
Use VIBRATE_ON main toggle to display on/off state as summary for
"Vibration & haptics" settings provider.

Fix: 220218654
Test: VibrationPreferenceControllerTest
Change-Id: Ifd4b9c7b1cb68ad0ea535091804a1e7f54297c44
 2022-03-23 12:14:52 +00:00
jasonwshsu
4bfe215e4c Add link functionality in message of magnification triple-tap dialog 
Bug: 210593079
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationModePreferenceControllerTest
Change-Id: Id69b0b717410b5c5c44a818c36688bb7331c73ae
 2022-03-23 19:44:33 +08:00