PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,824 Commits 1 Branch 0 Tags
2a2e0275cc787725606462d90f6575e8fe218cec
Commit Graph

84824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ac888d4bba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 964006012c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84923d0689ef90a2999535776674f83d33a3ab91
 2021-07-04 16:58:24 +00:00
Treehugger Robot
88d39847b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 16:00:20 +00:00
Treehugger Robot
964006012c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:19 +00:00
TreeHugger Robot
741686fe63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 260e662a6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a568dccc1da55e2d7405cbee6e2d4b932521bae
 2021-07-04 05:54:33 +00:00
TreeHugger Robot
25b618f8f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 61d76c1bcb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8518207df766a1146c79e50bed450d077804e63
 2021-07-04 05:54:14 +00:00
Bill Yi
a06b08e31b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3bdbe0be2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1c80568a5919d9f1c42804fb92c115ca0cae96b
 2021-07-04 05:53:42 +00:00
TreeHugger Robot
260e662a6e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:47:31 +00:00
TreeHugger Robot
61d76c1bcb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:40:32 +00:00
Bill Yi
2da15f5ff7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f0092859ef116b815fb7b0b808d26382f09a8e4
 2021-07-04 02:58:11 +00:00
Bill Yi
b3bdbe0be2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I46da67c58691feb24e1ce202fe42e00cc234bd08
 2021-07-04 02:56:39 +00:00
Bill Yi
3bddbf2fa5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1cbcb60c8c6e694c72af468b580cc27f72f2a7fe
 2021-07-04 02:53:23 +00:00
Bill Yi
ac0886d754 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id854c59331a03cf9a05828b1062e3c750c8603ba
 2021-07-03 18:45:56 -07:00
Bill Yi
18708c4f00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac0b5598da3ee6dedf95d2cb9f6e32109d9f19af
 2021-07-03 18:42:49 -07:00
Android Build Coastguard Worker
76503d5ed1 Snap for 7521311 from 010ea5488d to sc-release 
Change-Id: I8cfd3bf658a05b115b00561745a451d35383ba81
 2021-07-03 23:08:25 +00:00
TreeHugger Robot
f842525a16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e1ef076ca2bfefa3c8aad9b405be159181db1e2
 2021-07-03 04:07:37 +00:00
Bill Yi
dea9ddb667 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ade5cff85a5021451c439d40af5f7c73c8e8a14
 2021-07-03 04:07:07 +00:00
TreeHugger Robot
010ea5488d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9178f7fe03da40f82a9d4a76c8e489d579b23dca
 2021-07-03 04:00:18 +00:00
Bill Yi
42ead3c52e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia26fe52f2e7c8c707bc41238a5943b248bc03ee8
 2021-07-03 03:49:59 +00:00
TreeHugger Robot
143f419895 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours am: b9a9b7c6d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c94e5d07d6552525cf539b44ebee070ec6c9f2c
 2021-07-03 03:42:40 +00:00
Bill Yi
8d4727a3be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours am: 5cc1907655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddb036ec0e3ecb51cc50e01e1a45504fb354a3f2
 2021-07-03 03:42:36 +00:00
TreeHugger Robot
61ed5671ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c06b8e320 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4f466b8df72ea7a7d233f93159beb0c6e6d2285
 2021-07-03 03:41:40 +00:00
TreeHugger Robot
a69ea45cf7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-03 03:32:18 +00:00
TreeHugger Robot
b9a9b7c6d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibad4f24564961c34636570fc326270f243325db5
 2021-07-03 03:29:26 +00:00
Bill Yi
5cc1907655 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84e0049f2174ba96ac88dc1585ab116c44a16dcf
 2021-07-03 03:29:20 +00:00
TreeHugger Robot
3dd0be61d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-03 03:22:46 +00:00
TreeHugger Robot
2c06b8e320 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-03 03:22:36 +00:00
Android Build Coastguard Worker
166ee2d51e Snap for 7519874 from 83e4f3c658 to sc-release 
Change-Id: Iad140400c1bd5bf56accd17b5f057e2ce6ed10ea
 2021-07-03 03:11:11 +00:00
Bill Yi
d5d96e8dbd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3323ae4648d62878fa0d297d4cb8615f9b711cd8
 2021-07-03 00:41:18 +00:00
Bill Yi
23810f4a9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8204967e1a2b075d8c4deac65a2a359d9e4d14c6
 2021-07-03 00:27:54 +00:00
Bill Yi
6542938cff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc7150cb257216e2b01accdf7d1883674c1f6dd4
 2021-07-03 00:24:30 +00:00
Bill Yi
d1c91f40f0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1503e7f3d4e33f27c52e28f9327bc258b3531281
 2021-07-03 00:16:19 +00:00
Bill Yi
ba970ea415 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5f86f1661d49b0f77deb46f241c947a7a3de59a
 2021-07-03 00:11:33 +00:00
Ahaan Ugale
0cc68e8510 Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev am: 83e4f3c658 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177778

Change-Id: I64edc40f8c59526707832dc7afb4e26cdb82d023
 2021-07-03 00:07:27 +00:00
TreeHugger Robot
5adc2d8447 Merge "Fix landscape to reverse landscape issue" into sc-dev am: 493db88bf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15188505

Change-Id: Iab537b422edbe98b94f90cb20a95d1ef8e09a61a
 2021-07-03 00:07:16 +00:00
Ahaan Ugale
83e4f3c658 Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev 2021-07-02 23:56:20 +00:00
TreeHugger Robot
493db88bf4 Merge "Fix landscape to reverse landscape issue" into sc-dev 2021-07-02 23:49:36 +00:00
TreeHugger Robot
d518269171 [automerger skipped] Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5 -s ours 
am skip reason: Merged-In I4dafb7bf5b410d99cba7e30ee17f966611458db7 with SHA-1 43c3ba86cd is already in history

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

Change-Id: Iec11cfe0a09807d80cf2b32e0ce311c736c36e43
 2021-07-02 23:09:08 +00:00
Guojing Yuan
69a9368325 [CDM] Remove CDM companion apps from Connected Devices detail Settings 
Remove CDM companion apps from Connected Devices details Settings when
there's a FastPair slice.

BUG: 191992001

Test: Manual

Change-Id: Ic373736ff6e32765f8c9d13e7358455a82cd8333
 2021-07-02 23:02:38 +00:00
TreeHugger Robot
524f4979f5 Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev 2021-07-02 23:02:30 +00:00
Mill Chen
7f2496219f Fix landscape to reverse landscape issue 
Fingerprint enrollment page needs to display different types of layout
for both landscape mode and reverse landscape mode. However
onConfigurationChanged doesn't get called when landscape mode rotates to
reverse landscape mode directly, that causes it displays a wrong layout
in the both landscape and reverse landscape modes.

Trying to monitor rotation event and checking if the case that directly
turns landscape mode to reverse landscape mode happens, if so, reCreate
method will get called to re-lay out the page. There will be a flicker
problem happening in re-laying out the page but this solution still
works for users to have the correct layout.

Fix: 186372522
Test: manual test
1) Navigate to fingerprint enrollment page
2) Rotate the screen from landscape mode to reverse landscape mode
3) Observe the page and see if it has a correct layout

Change-Id: Ie94f43a6546f453c10ae9f1c3ba83e1178784950
 2021-07-03 06:40:25 +08:00
Rahul Sabnis
aa8275f8d3 Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 am: 3b68dd138c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1716270

Change-Id: I9c37ec40573808a91c6052e2d46cce28df7cfead
 2021-07-02 22:31:25 +00:00
Rahul Sabnis
3b68dd138c Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1716270

Change-Id: I2822d89ea7008d3a17cfb84f06f6c07ccfade3f9
 2021-07-02 22:17:23 +00:00
Rahul Sabnis
bec574dca7 Merge "Ensure settings maintains its Bluetooth device inquiry state" 2021-07-02 22:01:50 +00:00
TreeHugger Robot
4f33fea213 Merge "Only launchHandoffToParent in SUW" into sc-dev am: 59b82fad2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179572

Change-Id: I089b19e5cfbc10a4e22dced38e24b337a66bc41c
 2021-07-02 20:28:39 +00:00
Rahul Sabnis
0b365c3e69 Ensure settings maintains its Bluetooth device inquiry state 
Bug: 187165224
Test: Manual
Merged-In: I4dafb7bf5b410d99cba7e30ee17f966611458db7
Change-Id: I4dafb7bf5b410d99cba7e30ee17f966611458db7
 2021-07-02 20:27:17 +00:00
TreeHugger Robot
59b82fad2f Merge "Only launchHandoffToParent in SUW" into sc-dev 2021-07-02 20:14:33 +00:00
TreeHugger Robot
eb353285eb Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488eefb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: I4e2a09cf38bbc09cd776f8047201a14ec56fda5d
 2021-07-02 20:11:26 +00:00
TreeHugger Robot
8f9488eefb Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev 2021-07-02 19:59:32 +00:00
Ahaan Ugale
30a3e3c3ed Password settings: use EM DASH as the pwd count placeholder 
The current blank space in the UI looks like a bug if the password
manager doesn't return a result. (though this should rarely happen)

Fix: 192531856
Test: manual
Change-Id: Ia1765e51f1d4e5080c9a8419c8e81c2771caba7b
 2021-07-02 12:35:40 -07:00
Kevin Chyn
c702e1bfba Only launchHandoffToParent in SUW 
Settings flow does not need to show this screen

Fixes: 192586840
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true --ez skip_return_to_parent <true/false>
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest

Change-Id: Ic2edbb5ec9693d05c89206d49249f59fd968aa2f
 2021-07-02 12:04:06 -07:00