PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,805 Commits 1 Branch 0 Tags
0380c6a3294760ebde3335b71a85f318ea3aa7c6
Commit Graph

44757 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Chloris Kuo
fd947cb0b3 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110

Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:59:00 +00:00
Chloris Kuo
6f79ffd831 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev 2022-08-24 22:37:58 +00:00
menghanli
66a96d220e Fix tapping magnification crash in vision settings setup screen 
Root cause: ag/17286343 introduces hiding the settings entry in magnification settings if window magnification feature is not supported. It causes SuW page cannot find the settings preference reference.
Solution: Add null pointer check.

Bug: 242242266
Test: Manual testing
Change-Id: I1007a580047dd302228b28c15b82e958a2b01fec
(cherry picked from commit 5a87f6bbbf)
 2022-08-24 21:17:46 +00:00
Menghan Li
dc37f44a40 Merge "Fix tapping magnification crash in vision settings setup screen" 2022-08-24 21:17:21 +00:00
Chloris Kuo
54c677a83c Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications 
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.

Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
 2022-08-24 19:51:08 +00:00
Michael Wright
3b0cbefac1 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 am: bbde399410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Idcaa343d56921b2f2b4428a10fb5dffc99a0c698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:11:16 +00:00
Michael Wright
bbde399410 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:05:15 +00:00
Michael Wright
1218065085 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev 2022-08-24 15:24:15 +00:00
Lucas Silva
285bfe2917 Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640 am: 1eeae5a623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464

Change-Id: I51e5d21ba7e79c7752f2c824710443396257d025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:45:51 +00:00
Lucas Silva
1eeae5a623 Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464

Change-Id: Iaf38d68d9a2c03c2612ae17fec3094bc41087edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:16:59 +00:00
Lucas Silva
225b3b0640 Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev 2022-08-24 13:54:16 +00:00
lbill
7a4ddb8337 Set appropriate theme for SkipFingerprintDialog 
The SkipFingerprintDialog is instantiation in
SetupFingerprintEnrollFindSensor#onSkipButtonClick()

Due to the call flow did not set appropriate theme
defined in setuplib for skip alertDialog instance
we set GlifV2ThemeAlertDialog AlertDialog.Builder.

Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      SetupFingerprintEnrollFindSensorTest
Test: manual factory reset, go through SUW, and check
      skip AlertDialog Bottom Bar Buttons visual.
Bug: 233243999
Change-Id: Ic198a23eb3e76d70e287b24f2ab1ef249b30b2fc
 2022-08-24 13:45:21 +00:00