PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,692 Commits 1 Branch 0 Tags
66a56fdd377eca2979a19bc38f83503c5b46d45e
Commit Graph

114692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
66a56fdd37 Merge "Remove duplicate strings." 2022-08-26 17:52:54 +00:00
YK Hung
c8d69051a4 Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." 2022-08-26 17:00:47 +00:00
András Kurucz
0f484dbd88 Merge "Fix RTL layout for Notifications history" into tm-qpr-dev am: 64eb84bd7b am: 3ba24a4d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742516

Change-Id: I3fbad5f31ecdb0259bdbcc0fcb1404c0fddc3296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 16:31:26 +00:00
YK Hung
65b0c83dad Merge "Change the master code the same as tm-qpr-dev to avoid future merge conflicts." 2022-08-26 16:07:40 +00:00
András Kurucz
3ba24a4d94 Merge "Fix RTL layout for Notifications history" into tm-qpr-dev am: 64eb84bd7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742516

Change-Id: If754d4aed96372e28bae17ad04e11e2f087161a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 15:14:20 +00:00
András Kurucz
64eb84bd7b Merge "Fix RTL layout for Notifications history" into tm-qpr-dev 2022-08-26 14:54:54 +00:00
András Kurucz
711dc8f9e2 Fix RTL layout for Notifications history 
Using ConstraintLayout Guideline is causing an issue with RTL languages.

Test: check the Last 24hrs Notification history using forced RTL layout direction and different Display and Text sizes

Fixes: 243029840
Change-Id: Ia0807d94da4ad5aac7c8000460388ddb6ddbe987
 2022-08-26 13:14:53 +00:00
Tetiana Meronyk
4b3a489ad3 Merge "Remove overflow from guest user settings" 2022-08-26 12:17:18 +00:00
Bonian Chen
06664b8c37 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9 am: 90a36213bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248

Change-Id: Ibf866ba9ee70e2ada74c283f5e079d2136a61173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 11:36:54 +00:00
Bonian Chen
90a36213bb Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248

Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 11:17:02 +00:00
Bonian Chen
d2644b4ea9 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev 2022-08-26 10:52:02 +00:00
Bonian Chen
9202260a42 [Settings] Not allow APN delete when adding is not an option 
When not allowing APN to add, user may not be able to recover easily
when delete it.

Therefore, avoid from APN to be deleted when adding is not allowed.

Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
 2022-08-26 08:50:51 +00:00
Zaiyue Xue
53b816c7be For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion. 
latest screenshots: https://drive.google.com/drive/folders/1V2UoBO2tOVydVxT5Yd5ASruuzizy-s7F?resourcekey=0-z2UInYUQ3mLGG80hedO78A&usp=sharing

Test: manual
Bug: 242009481
Change-Id: I3f717add0bcce1d3697c9ff6e91032e3817e6304
 2022-08-26 15:43:06 +08:00
TreeHugger Robot
19eb9a77b6 [automerger skipped] Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev am: 6b5dc07b95 am: a2c9a702dc -s ours 
am skip reason: Merged-In I3e595c96a55f1114b50ed5ed8e49e962cc90cbde with SHA-1 079aaf1261 is already in history

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

Change-Id: I348a1d2b590f16eb98877e51e95da0a6c8c0b401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 06:16:04 +00:00
TreeHugger Robot
a2c9a702dc Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev am: 6b5dc07b95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745373

Change-Id: If0db0c59dce301909f6a1d7d5f4453fb04a2c1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 05:54:41 +00:00
TreeHugger Robot
6b5dc07b95 Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev 2022-08-26 05:36:37 +00:00
Zaiyue Xue
4bb92296b5 Change the master code the same as tm-qpr-dev to avoid future merge conflicts. 
Bug: 243746796
Test: manual
Change-Id: I9c693a65ebbbe33c9d132131f832c26505a23a4e
 2022-08-26 13:36:36 +08:00
TreeHugger Robot
7159aec1d6 Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c39783771 am: b9a44a9130 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745374

Change-Id: I240b05be141d48c6137561f3e300bd5deb4ff45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 05:00:40 +00:00
TreeHugger Robot
b9a44a9130 Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c39783771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745374

Change-Id: I72232623545b854b4683c2ec1013d7bf5ac858a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 04:41:26 +00:00
Zaiyue Xue
fb3ebf8dc7 Fix b/243746796 Crash when mouse hangs over an empty battery chart 
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
Merged-In: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
 2022-08-26 12:32:05 +08:00
TreeHugger Robot
9c39783771 Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev 2022-08-26 04:19:51 +00:00
Bill Lin
855dc04b31 Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d am: b154b58576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513

Change-Id: Ia0594542f46c9d3b62c0e78f439d1d13cecdbcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 02:11:55 +00:00
Bill Lin
b154b58576 Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513

Change-Id: I95c27570429ac01d467545543627ef0854194113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 01:50:30 +00:00
Bill Lin
37dfb4c46d Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev 2022-08-26 01:19:04 +00:00
Menghan Li
9c16fc3732 Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b4b am: f481637370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732075

Change-Id: Id2a2972186010af063d97c8f6c37947f668c05eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 00:09:41 +00:00
Kweku Adams
5949fccc7a Remove duplicate strings. 
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
 2022-08-26 00:07:08 +00:00
Menghan Li
f481637370 Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732075

Change-Id: Ib412dc1639942389c417ec2516a1f99b52a951f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 23:49:57 +00:00
Menghan Li
b5ee432b4b Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev 2022-08-25 23:37:50 +00:00
Joshua Mccloskey
94859d0642 Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e am: f74ddd65b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606

Change-Id: Ifefac73fa45e44816efd0cae2cea58ea0a30a135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 22:56:07 +00:00
Joshua Mccloskey
f74ddd65b8 Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606

Change-Id: Iab77f3cf874f4271f603a9575afeff0ffd8732af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 22:35:13 +00:00
Joshua Mccloskey
128746648e Merge "Replaced fingerprint finish strings." into tm-qpr-dev 2022-08-25 22:20:32 +00:00
TreeHugger Robot
fb2090e643 Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" 2022-08-25 16:19:14 +00:00
TreeHugger Robot
2802ec1c44 Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." 2022-08-25 16:19:10 +00:00
Zaiyue Xue
87db35205a Fix b/243485315: NullPointerException when getAppBatteryUsageData(). 
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
 2022-08-25 13:36:44 +00:00
lbill
b77c2639d9 Refine face enroll & remove button layout padding 
The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.

Test: manual Security > Face Unlock > Delete face model
      > Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
 2022-08-25 10:24:09 +00:00
Tom Hsu
4d7259124c Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev am: 12377854b1 am: 7ddbff8eca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674442

Change-Id: I43c9870d10b567590d7d18968e36989584d76458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:45:00 +00:00
Tom Hsu
a4c1b781d7 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237 am: a18ec335a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012

Change-Id: If2e0c2b9b4d8e981ea42eeea4ebdbe0617f998cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:44:57 +00:00
Tom Hsu
039563f77d Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3 am: 7dfd2ade2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790

Change-Id: Ia139b19e541ebc66ea0228417a4cefa06a4ce93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:44:56 +00:00
Tom Hsu
7ddbff8eca Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev am: 12377854b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674442

Change-Id: I43489e9e2476925c2680b8ec7da335900e0ad106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:25:46 +00:00
Tom Hsu
a18ec335a9 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012

Change-Id: I30906dc1a60949776b27ba6df3fe723f1eed6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:25:44 +00:00
Tom Hsu
7dfd2ade2f Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790

Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 07:25:42 +00:00
Zaiyue Xue
8e00605228 Fix b/243485315: NullPointerException when getAppBatteryUsageData(). 
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
 2022-08-25 14:50:32 +08:00
Tom Hsu
12377854b1 Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Tom Hsu
34cb6d3237 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3 Merge "[Languages] Add new information to system language page." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Bill Lin
1e60f829e9 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391 am: ac4f84f05d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587

Change-Id: I1d714e27beaa1f3ac5bccd45e5c11663d2fcba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 06:10:59 +00:00
Zaiyue Xue
079aaf1261 Fix b/243746796 Crash when mouse hangs over an empty battery chart 
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
 2022-08-25 13:45:01 +08:00
Bill Lin
ac4f84f05d Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587

Change-Id: I404da502a6cfa3d8e40ca7ee935332e9e4931968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 05:41:19 +00:00
Bill Lin
fd8e54e391 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev 2022-08-25 04:36:14 +00:00
TreeHugger Robot
5d42149249 Merge changes from topic "nfc_logging_control_master" 
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
 2022-08-25 03:31:24 +00:00