PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,710 Commits 1 Branch 0 Tags
7d5f1dc09a214d4b3ae3e702a56f27a728f670d4
Commit Graph

114710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7d5f1dc09a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-26 18:49:51 +00:00
Bill Yi
edabf34003 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-26 18:49:51 +00:00
YK Hung
571b54e7fa Merge "Support showing battery level chart first immediately after the battery level data is ready." 2022-08-26 18:39:25 +00:00
TreeHugger Robot
8876e02d32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 45dfad65ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9951c057dd38669ccf7c098693489a125789a90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:43 +00:00
Bill Yi
f1a0c037eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 052b8aa9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65742035ea6401fbe4d8948e45abd55c3d523630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:30 +00:00
Bill Yi
481c88ad00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: ccc21cf723 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d384603560a8369a04dab26ce994502f81a3565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:20 +00:00
TreeHugger Robot
45dfad65ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I523728e7043db8b83d5dbb590ebe70294bec3f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:45 +00:00
Bill Yi
052b8aa9a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45fc119abbbc720979a0fad0298ff4336f6391c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:32 +00:00
Bill Yi
ccc21cf723 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie854e40e379d7f325efef3f947cfa4ab81bf71f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:21 +00:00
TreeHugger Robot
66a56fdd37 Merge "Remove duplicate strings." 2022-08-26 17:52:54 +00:00
TreeHugger Robot
2810928518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-26 17:25:46 +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
Zaiyue Xue
adc36d085b Support showing battery level chart first immediately after the battery level data is ready. 
When the battery level chart is shown but app usage data is not ready,
the battery chart is still clickable, but the app list won't show. Once
the app usage data is ready, the app usage list of the latest selected
period will show. Please see the following screen record of forcing
loading app usage data very slow. In the real case, the app usage
loading is not that slow.

https://drive.google.com/file/d/196rlzwSa52xrQFRfF2gdHJJPZn-uecZF/view?usp=sharing&resourcekey=0-mGggQGG7IMd5-bSAG7l_LA

Bug: 243887839
Fix: 243887839
Test: manual
Change-Id: I170eb4afb46b1d0040b7971460b1b37dde5d1362
 2022-08-26 14:25:24 +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
Bill Yi
35050ec915 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id643655a5a5a83eb63d3884db72c9f4ea3b6cf49
 2022-08-25 08:47:20 -07:00
Bill Yi
e8d77f42af Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I22a0a6273650a53203006e2cb7c2ed97f6bf5398
 2022-08-25 08:43:49 -07:00
Bill Yi
4e5669b82f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
 2022-08-25 08:40:29 -07:00