PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,477 Commits 1 Branch 0 Tags
1079d2160d3f44fb78aefc7e8c72ca18c85fae97
Commit Graph

72477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1079d2160d Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: Ibe684fce2f0986dc15147085fe58d575be510f87
 2021-08-10 03:07:39 +00:00
Treehugger Robot
fdea2eaffa Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." 2021-08-10 02:54:06 +00:00
Treehugger Robot
93a418718f Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
 2021-08-04 01:28:25 +00:00
Xin Li
4785355302 DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
 2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Yifan Hong
eddbc8a356 Merge "PairDevice to structured Parcelable." am: f7ff663887 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
 2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887 Merge "PairDevice to structured Parcelable." 2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
 2021-08-03 16:07:50 -07:00
Yifan Hong
1b586ec8dc IAdbManager.getPairDevices returns FingerprintAndPairDevice[]. 
Map is not supported in C++ backend. To compile IAdbManager in C++,
Map is translated into a list of key, value tuples.

Test: pass
Bug: 190867939
Change-Id: I1a057306161a4f8eaef33e3c40b1db9494aea3e5
 2021-08-03 14:05:32 -07:00
Yifan Hong
d61750990d PairDevice to structured Parcelable. 
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
 2021-08-03 14:05:31 -07:00
Treehugger Robot
f5876a1df9 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb
 2021-07-30 02:35:23 +00:00
Treehugger Robot
060bf953e3 Merge "Fix memory leak in TopLevelBatteryPreferenceController" 2021-07-30 02:18:11 +00:00
Anita Hemrajani
6187ec83a8 Fix memory leak in TopLevelBatteryPreferenceController 
Assigning context.getApplicationContext() as context in
ConditionContextualCardController.

Bug: 181192885
Test: run connectivity module auo test pass

Change-Id: Iff35520f911a9fd62a0bbb5bbda20608e9d99246
 2021-07-29 15:30:28 +08:00
TreeHugger Robot
b515d34c40 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-28 23:37:43 +00:00
Bill Yi
8c818c3b4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id06c20035f64636a8b7799fbb847fdf852b70e4b
 2021-07-28 15:13:59 -07:00
Bill Yi
b23c15307c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieede676484ceb3dbefc8c6aaf0b90a1043fe6ed1
 2021-07-28 15:10:23 -07:00
Menghan Li
be1e8a077b Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529

Change-Id: Ife618f059ab34b3df08c51b52629a83c6a4c0426
 2021-07-14 09:55:44 +00:00
Menghan Li
f36c2bc0a4 Merge "Update OWNERS for package settings > accessibility" 2021-07-14 09:41:41 +00:00
menghanli
b537d169b4 Update OWNERS for package settings > accessibility 
Bug: 193589847
Test: Manual
Change-Id: I57d27181d83cf47df9f4d0d359a2d76df3e3c91a
 2021-07-14 14:16:35 +08:00
Bill Yi
4cc5d4371e [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours 
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006 is already in history

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

Change-Id: Ib6d3045e956672a1832742b1de90f8d000543c4e
 2021-07-13 01:02:57 +00:00
Bill Yi
e36e5876d6 Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" 2021-07-13 00:48:38 +00:00
Bill Yi
7976c5bc51 Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 
Merged-In: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Change-Id: I0f793ed1ea64127903c6dc906c5afa1db15fff48
 2021-07-12 11:08:29 -07:00
Bill Yi
275dc390bd Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-07-12 13:14:39 +00:00
Treehugger Robot
476c3dc62a Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I48ab5a9d8bd431e6e9854d9f3c36373f95118cf6
 2021-07-12 10:49:01 +00:00
Treehugger Robot
8dd6ce02d8 Merge "Revise strings for the NFC developer option" 2021-07-12 10:38:43 +00:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option 
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
 2021-07-12 16:39:22 +08:00
Bill Yi
2c5d2dfc74 Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE 
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I2b0706fc636af827e9a7f76ca00c99653d569dbf
Change-Id: I47f15d872a0adcafe26fa349b3d0ecdcdc061872
 2021-07-11 22:43:41 -07:00
Treehugger Robot
4909b81006 Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
 2021-07-06 08:24:55 +00:00
Treehugger Robot
9d7b0beb87 Merge "Add a developer option to increase nfc stack log level" 2021-07-06 08:05:47 +00:00
Treehugger Robot
3d1551cf4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c3dd739c8052f2ecc5152900ba1cfb61de52aa9
 2021-07-04 16:59:18 +00:00
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
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
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
Tom Hsu
6ff7306d51 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I317a0e09d0d43cdaa96baead76416d09b018a20a
 2021-07-01 12:12:33 +00:00
Tom Hsu
53f081be37 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." 2021-07-01 12:00:52 +00:00
tom hsu
58d100c3a0 [Settings] Prevent crash from abnormal behavior for ApnSettings page. 
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Merged-In: I179c708debcbc31ba9a93e4e434ae810051f5004
Change-Id: If59f68f595794695600811224cdedb4692b869c0
 2021-07-01 17:10:56 +08:00
Wesley Wang
8d7f25430b Merge "Remove unnecessary converting us to ms in BatteryInfo" am: f4ababa50b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1749740

Change-Id: I1c1f0d8fcc457c2249a6b691367bd5e008163cec
 2021-06-29 10:06:17 +00:00
Wesley Wang
f4ababa50b Merge "Remove unnecessary converting us to ms in BatteryInfo" 2021-06-29 09:52:07 +00:00
Wesley.CW Wang
30b60195e8 Remove unnecessary converting us to ms in BatteryInfo 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond,
so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests
Change-Id: Iefbd8751608eb749367cf08a4a9b184b948a6d33
 2021-06-28 17:59:35 +08:00
Xin Li
4d789befc6 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours 
am skip reason: Merged-In I73964718e9b3d66dbe189f48bfe6d1b16ec921f4 with SHA-1 e774cf9cd3 is already in history

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

Change-Id: I5c526745444d10d77df6fe6496f2e0a0af1fab69
 2021-06-21 06:10:20 +00:00
Xin Li
a8cf9a798d Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:05 +00:00