PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,350 Commits 1 Branch 0 Tags
7d952e6ad1105f138959159c765892f33dcbc24b
Commit Graph

77350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beth Thibodeau
62384851e0 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I8e7a6c1974a2cd78438bcaa79ee003c787133aa9
 2020-09-17 19:12:18 +00:00
Beth Thibodeau
51499b2f51 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I4019b79c2ee725d518ff9c7b6714bda772133d47
 2020-09-17 19:12:14 +00:00
Jeremy Goldman
d620baa3d7 Merge "[Testing] AndroidJUnit4 NetworkSelectSettingsTest" 2020-09-17 18:58:36 +00:00
TreeHugger Robot
0be898b31b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:27:09 +00:00
TreeHugger Robot
697d2e1fad Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:20:10 +00:00
Beth Thibodeau
7ca988cab1 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev 2020-09-17 17:56:29 +00:00
Beth Thibodeau
70920bd9ff [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." 
Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: Ieacef217587476532246b466d680219351bc1657
 2020-09-17 17:55:56 +00:00
Jeremy Goldman
7cb2738fdb [Testing] AndroidJUnit4 NetworkSelectSettingsTest 
Test: atest -c NetworkSelectSettingsTest
Change-Id: I1d842cd522df87d1cc762b50ae43e9efc723b154
 2020-09-17 16:08:33 +00:00
TreeHugger Robot
0151dd8a8a Merge "Fix the device on "Media devices" wouldn't update" am: a4161789d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12614864

Change-Id: I42570a91f3c9c177a4e5932b9291f14d216baa2d
 2020-09-17 14:17:37 +00:00
Bill Yi
17d8f4e53a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2d693eb2a6060bd39063cd1e1b6a677c555a500
 2020-09-17 13:36:15 +00:00
Bill Yi
fc1e97b985 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I808f46f1aaebeccdfd1bf4c0c561925830b97717
 2020-09-17 13:01:33 +00:00
TreeHugger Robot
a4161789d6 Merge "Fix the device on "Media devices" wouldn't update" 2020-09-17 11:32:12 +00:00
Kevin Chyn
d4821afee4 Merge "2/n: Add default implementation for multi-biometric enroll" am: b646169818 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12549863

Change-Id: If74ed2f0bdafe4c4925cb7f6101d0827ca12924a
 2020-09-17 11:22:28 +00:00
Jiashen Wang
cc9fcd3356 Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd am: 6538ee53cf am: 624cea1b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221

Change-Id: I45f43a8bde1989b9859e1dff03921101382a9c90
 2020-09-17 09:54:21 +00:00
Hugh Chen
c3d4b9ace9 Fix cast volume control bar not work 
Use hashcode as a requestCode id, since the
same requestCode will cause the intent be cached.

Bug: 163095633
Test: make -j42 RunSettingsRoboTests
Change-Id: I2c120f18e24a66aeff5565e952fa4064149ec540
Merged-In: I2c120f18e24a66aeff5565e952fa4064149ec540
(cherry picked from commit 7f3efd4357)
 2020-09-17 08:53:11 +00:00
Hugh Chen
cafeab2813 Fix the device on "Media devices" wouldn't update 
- This CL use new CachedBluetoothDevice callback instance
  in construct to avoid unregister wrong callback.
- This CL use flag to make sure preference will register
  callback on onAttached() when preference remove callback
  on onPrepareForRemoval() or onDetached().
- Update test case

Bug: 168682778
Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a0d9f5332153ee80634e191847b84cd7c380b7d
 2020-09-17 08:45:12 +00:00
TreeHugger Robot
602791ae6a Merge "Updates scale values on back sensitivity sliders" am: dd8e325da4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12489722

Change-Id: I9a49256a5b3c58cff610ee80cc01cca1f7ef6c39
 2020-09-17 08:33:30 +00:00
Kevin Chyn
b646169818 Merge "2/n: Add default implementation for multi-biometric enroll" 2020-09-17 07:43:59 +00:00
Kevin Chyn
87bb772e16 2/n: Add default implementation for multi-biometric enroll 
1) Adds a layout for multi-biometric selection in BiometricEnrollActivity
2) Adds widgets for checkboxes
3) Shows ConfirmLock*/ChooseLock* for multi-biometric devices in
   BiometricEnrollActivity
4) finish()'s when loses foreground
5) Adds default string for ChooseLock* and multi-biometrics, e.g.
   "Set up Password + Biometrics", as well as associated plumbing
   to bring the user back to BiometricEnrollActivity once the
   credential is enrolled
6) When max templates enrolled, checkbox becomes disabled and
   description string is updated

Bug: 162341940
Bug: 152242790
Fixes: 161742393

No effect on existing devices with the following:
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW
Test: make -j RunSettingsRoboTests

Exempt-From-Owner-Approval: Biometric-related change
to EncryptionInterstitial

Change-Id: I855460d50228ace24d4ec5fbe330f02ab406cc02
 2020-09-16 23:30:11 -07:00
Jiashen Wang
624cea1b7a Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd am: 6538ee53cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221

Change-Id: Ibe4302c154adf38f4ee76e0279691e5d06304e2e
 2020-09-17 02:52:12 +00:00
Jiashen Wang
6538ee53cf Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221

Change-Id: If39f36992de53f89ce07ef5ff1ddb597800dff58
 2020-09-17 02:27:04 +00:00
TreeHugger Robot
dd8e325da4 Merge "Updates scale values on back sensitivity sliders" 2020-09-16 22:44:58 +00:00
Jiashen Wang
f537a702dd Do not display eSIM activation option if the device is eSIm ignored 
For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested

Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
 2020-09-16 15:33:51 -07:00
Julia Reynolds
22b1bb81dd Merge "Fix crash on rotation" am: ebfa9e31a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12586155

Change-Id: I4e84b6e751753d937689329b5f349ed87666bbbb
 2020-09-16 15:02:47 +00:00
Julia Reynolds
ebfa9e31a1 Merge "Fix crash on rotation" 2020-09-16 13:21:31 +00:00
TreeHugger Robot
3528407e97 Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7 am: cdf6fb31f0 am: b116a4d253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486

Change-Id: I4265146ddc98f5652e987ec88730083d86aef559
 2020-09-16 05:04:14 +00:00
TreeHugger Robot
f5f63029c5 [automerger skipped] Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac am: e8b47df453 -s ours am: bfdcceb223 -s ours 
am skip reason: Change-Id I684501a20a67755b2196ba9d4b5565add01a5d01 with SHA-1 386df49bbc is in history

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

Change-Id: I997d82d2d0450316d39b37660a15f9f6a1812040
 2020-09-16 04:59:03 +00:00
TreeHugger Robot
b116a4d253 Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7 am: cdf6fb31f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486

Change-Id: Id87a6f4c150f529c87b49833d7dc189f0d2a012a
 2020-09-16 04:32:52 +00:00
TreeHugger Robot
bfdcceb223 [automerger skipped] Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac am: e8b47df453 -s ours 
am skip reason: Change-Id I684501a20a67755b2196ba9d4b5565add01a5d01 with SHA-1 386df49bbc is in history

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

Change-Id: Iad4e4209cbb2189103ef05582be3dfbe03c18576
 2020-09-16 04:31:38 +00:00
TreeHugger Robot
cdf6fb31f0 Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486

Change-Id: I3de2dab20767ae2e3a132cf611b85b77cbe1fc56
 2020-09-16 03:43:32 +00:00
TreeHugger Robot
e8b47df453 Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714

Change-Id: Ic3f113e706c9fe3f74eb61a2b980df9a271d806a
 2020-09-16 03:42:54 +00:00
TreeHugger Robot
19af143fe7 Merge "Fix settings crash" into rvc-qpr-dev 2020-09-16 03:09:38 +00:00
TreeHugger Robot
2b52c56eac Merge "Show just disconnected device on previously connected" into rvc-qpr-dev 2020-09-16 03:09:30 +00:00
Jeremy Goldman
9350529f9d Merge "[Testing] AndroidJUnit4 RoamingPreferenceControllerTest" am: 953ed3dcd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559295

Change-Id: I0ca31fe9903bb1a63c38c4be0783095c2f0332f3
 2020-09-16 01:09:22 +00:00
Jeremy Goldman
953ed3dcd2 Merge "[Testing] AndroidJUnit4 RoamingPreferenceControllerTest" 2020-09-16 00:48:31 +00:00
TreeHugger Robot
35e7a17b9f Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38 am: 9dc594b90d am: f24ec05725 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713

Change-Id: Ifa1778fcbb4827375fdd19ccd486d9bdf12b7222
 2020-09-16 00:17:40 +00:00
Arc Wang
1039628c5e [automerger skipped] Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd am: 84ac360560 -s ours am: f646e6aac9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109

Change-Id: I59bc1880efb8e3bffd97c27976ee048bab59f64d
 2020-09-16 00:14:07 +00:00
Arc Wang
fec8f04712 [automerger skipped] [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68 am: 3782ff7edd -s ours am: 5f3be310fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109

Change-Id: Ie39d1a625d4db3078d19fe92eb112250dd8b4e41
 2020-09-16 00:14:02 +00:00
Bonian Chen
ce5bd9fa62 [automerger skipped] Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 am: ccc406381a am: 3864e2f218 am: 5d1da01e80 -s ours am: d039623d94 -s ours 
am skip reason: Change-Id I81b3d6ac075666a45649c8d811832a40bdb1b41b with SHA-1 c3aa6d26ee is in history

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

Change-Id: I8012cd334c73c71a190ad2c969e777fe84d67deb
 2020-09-16 00:07:11 +00:00
TreeHugger Robot
40c9509748 Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev am: eacabd567f am: bf4a795692 am: 5fa3aa40be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493712

Change-Id: I13b5c6368964ea13cd2012ea0f972eb11efd43c6
 2020-09-16 00:02:00 +00:00
TreeHugger Robot
8d290b17a4 [automerger skipped] Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e am: 2dfac98e04 -s ours am: 71350de040 -s ours 
am skip reason: Change-Id I7a1451a36a31253b6be2203341bea4e59fed7c2b with SHA-1 bde100849e is in history

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

Change-Id: I199472b3a848764a9682ebaa370f9b8f470df92b
 2020-09-15 23:33:48 +00:00
Bill Yi
99b8f106b8 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours am: fe8f27e508 -s ours am: 76798cd54a -s ours am: 8195f76b67 -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: I80744780dc0066538ef29584571ee7e7b1838b7c
 2020-09-15 22:43:40 +00:00
Betty Chang
ee9cc69b06 Merge "[Testing] Use AndroidJUnit4 instead in DataUsageInfoControllerTest" am: 195aa70291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523488

Change-Id: Iba7fc112380a6d8818a9a3f4f1c700d2a763cb30
 2020-09-15 21:36:35 +00:00
TreeHugger Robot
ccae3a27b9 Merge "Fix the ANR in panel when changing volume continuously" am: 8678e5112a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401650

Change-Id: I738725b4b3105e51671badb473d41d71cd39037d
 2020-09-15 21:35:07 +00:00
Betty Chang
5b4e46bc3e Merge "[Testing] Use AndroidJUnit4 instead in CarrierSettingsVersionPreferenceControllerTest" am: 090f32f03d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12555522

Change-Id: Ia2974eaed5ac6b23d2c041c664a8514373db0e2a
 2020-09-15 21:35:00 +00:00
TreeHugger Robot
1876422fec Merge "Hide the icon if didn't have media session or album art" am: 34937eb21e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533598

Change-Id: I7a08fe44cb3c8505baa2ce9a6178fbc7a1cae225
 2020-09-15 21:34:52 +00:00
TreeHugger Robot
7b5a0e3ca5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 195b27edb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5dead3afd6a1a64070dc43f612d0e84db5134e7
 2020-09-15 21:34:46 +00:00
TreeHugger Robot
0b2fc2d44c Merge "Add a feature flag for settings contextual home." am: 7fb5f93858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12556038

Change-Id: I8c8d56acbe8537c998587e970f8f170993308de4
 2020-09-15 21:34:36 +00:00
Bill Yi
8c1810f019 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf99f9c34a -s ours am: de75424d55 -s ours am: afd945f6c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e8210839050e6522f0bb8fab6b83f6a53c49284
 2020-09-15 21:26:43 +00:00
TreeHugger Robot
09c4cd7922 Merge "Merge mainline-prod into master" am: d9e691b536 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12562389

Change-Id: I462ade856b927d2efb7de6fca1753f454b8377a0
 2020-09-15 21:26:27 +00:00