PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,560 Commits 1 Branch 0 Tags
f3e249b813dfeb4ff1eb8dc1e7c88d4057d0561d
Commit Graph

120560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
f3e249b813 Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a am: 07618e1cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044

Change-Id: Icc59e931b725a8a2408c5ebeb6e461f4308eee62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 03:53:05 +00:00
Weng Su
7d642541b7 Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a am: b0e3972f8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044

Change-Id: Ib6373f7aea55af0861daed22e1c210f6ab34f85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 03:12:32 +00:00
TreeHugger Robot
350a37e46b [automerger skipped] Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb am: 4f191d9588 -s ours 
am skip reason: Merged-In I1e89e99ef11cd1fb64750709e331e1f059d2eeaf with SHA-1 b52fb4ce0b is already in history

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

Change-Id: Ic394563bd09cace41ad3c5a8f36fd76b2ddcec48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:59:48 +00:00
Weng Su
b0e3972f8c Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044

Change-Id: I6fa29502a440a88303b17cbeb09dfbe653ede340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:59:03 +00:00
Weng Su
07618e1cec Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044

Change-Id: Ie8f4eaeeab908a913b85d0d1a0b97c848248d89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:58:57 +00:00
Henri Chataing
f23819840e Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 am: c2c408f3b4 am: 8a77c25623 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I229194b895d508d25274950dadb1cc00d0d49471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:56:53 +00:00
Weng Su
d078d1f00a Merge "Refer to the last Hotspot password when generating the password" into udc-dev 2023-02-25 02:33:55 +00:00
TreeHugger Robot
4f191d9588 Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175

Change-Id: I55e21038d89b5322e8c04f3c4729b25070b967c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:28:38 +00:00
TreeHugger Robot
8e2045213c [automerger skipped] Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb am: 76a930705b -s ours 
am skip reason: Merged-In I1e89e99ef11cd1fb64750709e331e1f059d2eeaf with SHA-1 0172ff6942 is already in history

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

Change-Id: Ia05e37c76a3049447452b075d36648ba10be19a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:25:09 +00:00
Henri Chataing
a55ba21457 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 am: c2c408f3b4 am: 2f83720dab 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I4e35d6e2bbe846ace37acca34860632a6fb13b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:24:45 +00:00
Henri Chataing
8a77c25623 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 am: c2c408f3b4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I00eabf4a0f6278d5ef6a241f3d7b27ec9a8cb5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:19:11 +00:00
TreeHugger Robot
76a930705b Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175

Change-Id: I09e1f7cbc722ef59e5cacf3c354f3a7de289d1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:50:40 +00:00
Henri Chataing
2f83720dab Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 am: c2c408f3b4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I7ac6eadaf67b235c67f9b1c4b037e7f725ef8644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:47:40 +00:00
TreeHugger Robot
887a733ebb Merge "Update strings based on UX/product feedback" into udc-dev 2023-02-25 01:05:32 +00:00
Henri Chataing
c2c408f3b4 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:02:19 +00:00
Henri Chataing
5bb48d9250 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:54:34 +00:00
Henri Chataing
1325de7875 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:02:43 +00:00
TreeHugger Robot
a6ea56f774 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 am: ade18c1ffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I79215a2118df5ebb87af54718c18b9eb1a803e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 20:42:24 +00:00
TreeHugger Robot
92efcd50c9 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 am: d9d0d1bb7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: Id3e0bc1edbe1827d79d935a085926bba51c06070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 20:26:02 +00:00
TreeHugger Robot
ade18c1ffe Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I639c4bab90359dd33d557b05acd1d43556c7a184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 19:55:37 +00:00
Becca Hughes
b52fb4ce0b Update strings based on UX/product feedback 
Update settings strings for cred man based
on feedback.

Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
 2023-02-24 19:50:50 +00:00
TreeHugger Robot
d9d0d1bb7a Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I3cb57e455477a21b130862be572b421663d16dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 19:46:05 +00:00
Becca Hughes
d9ce857fd5 Merge "Update strings based on UX/product feedback" 2023-02-24 19:45:33 +00:00
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev 2023-02-24 18:54:44 +00:00
TreeHugger Robot
9713d1ce2d Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: f52774ec73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I3fc4b391adece41faa7fe8157854d62a30f77e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 18:53:29 +00:00
TreeHugger Robot
f52774ec73 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I9cb9e491dd4f356ac9fc3c0e67a180d45a8230e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 17:55:37 +00:00
TreeHugger Robot
2ef53d0a79 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: fa2b0ef4ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I494c6d1c211318e1bcce47a5ae2b173455d05c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 14:08:30 +00:00
Zaiyue Xue
95c4e00924 Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc am: 1ee1cc368f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I5c2d6b84f10504df73d15cff263202fbc90eeb4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 14:05:48 +00:00
TreeHugger Robot
6ebf140fd7 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I1c9f640d8681e68cb6277724d412251fac2008df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:34:45 +00:00
TreeHugger Robot
fa2b0ef4ae Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I285a39d07df9cf76fac6ebb4de1a6e1909771030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:32:50 +00:00
Zaiyue Xue
1ee1cc368f Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I7c47d61fd6cf6f1662dc77e7bf744b71f393a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:44 +00:00
Zaiyue Xue
c6166bc07d Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: Ib0c1ebd27bc65db95fccae3a67514b7687d662b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:35 +00:00
TreeHugger Robot
f9ef8e39f5 Merge "Fix b/270656372 unit test failure." into udc-dev 2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
ac92edd8cf Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f am: 35ec32bb18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: Ic703f7095014c9c34fb8395d7c2cffc88c401c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:53:34 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:09 +00:00
Vincent Wang
731ded4f9a Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I5afdcebedeff7b17cbcf3499d2b81c09502eedac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:01 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
TreeHugger Robot
60c8c5e985 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e am: 5d32369ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I74832d8b7d850c582e25a5d881bc8c78718bc418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:26:06 +00:00
Tom Hsu
4c30d29dd5 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 am: ad6359cfbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4239916ef65de0a83712890ec8092c49971d1183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:24:32 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100% 
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
 2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea Fix b/270656372 unit test failure. 
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider

Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
 2023-02-24 19:13:50 +08:00
TreeHugger Robot
58333856cd Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: Idc4b057032a4efcbeb48fce1767d06a4e163b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:50:10 +00:00
TreeHugger Robot
5d32369ec8 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I090cef5138a424af861d3e2a306c8f8657c421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:49:58 +00:00
Tom Hsu
a74a9bf6c2 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4a1b9290a8729271ac08e4283432af32ec524931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:57 +00:00
Tom Hsu
ad6359cfbb Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: Iea1de3d7bfe3db293deed904c1459da57478d6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:26 +00:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559 Merge "Switch off Calendar UI fo regional preferences" into udc-dev 2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment 
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
 2023-02-24 08:43:17 +00:00