Bonian Chen
f01cea0236
Merge "[Settings] Code Refactor" am: 8ae657bd80
am: f6d9536922
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620
Change-Id: I5b90defe3741e720280fe026ab45f57b013fa640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 10:36:53 +00:00
Bonian Chen
f6d9536922
Merge "[Settings] Code Refactor" am: 8ae657bd80
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620
Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 10:11:28 +00:00
Bonian Chen
8ae657bd80
Merge "[Settings] Code Refactor"
2022-11-21 09:32:30 +00:00
Weng Su
d46c3848a9
Keep "Resetting your internet" when screen rotates
...
- The fragment of Internet Settings will be destroyed and recreated when screen rotates
- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed
- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary
Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:55:22 +00:00
Cole Faust
37cfdc7536
Fix errorprone warnings that should be errors
...
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:
BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower
See https://errorprone.info/bugpatterns for more
information on the checks.
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Merged-In: I21aa58ebc02327849ed2161dbbafcdc806c007f2
Change-Id: I2fbc9701a4ad1caa264e0b22e02fd0dab310eabd
2022-11-19 22:42:42 +00:00
Yanting Yang
8c5a1d4ab2
Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev am: 06125115a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514510
Change-Id: If667eaba37c2bf6417053a9477187009ce809efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 19:16:40 +00:00
Yi-Ling Chuang
2dd4058e37
Remove BatteryFixSlice as it's not used am: 2f80e073d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514509
Change-Id: I536b1e852ddcf5154c8aeb64ae755156330aa9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 19:16:34 +00:00
Yanting Yang
06125115a0
Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev
2022-11-19 18:33:05 +00:00
Bonian Chen
c3028291ed
[Settings] Code Refactor
...
Adjust code structure for maintainance.
Bug: 259611847
Test: auto test
Change-Id: I1fab8d0347f64c01ee768e4bb9ea838a9e7ad4fc
2022-11-19 13:14:07 +00:00
Hao Dong
8c5d8e694a
Use the internal max faces number to check enrolled.
...
Test: manually tested on device
Test: robotest for FaceEnrollIntroductionTest
Bug: 243759589
Change-Id: I193c7b7c49f884541bd5d8282d15bf69e46f3392
Merged-In: I193c7b7c49f884541bd5d8282d15bf69e46f3392
(cherry picked from commit b4000fb226
)
2022-11-18 20:43:38 +00:00
Sandeep Jawalkar
dce53c2f80
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3de
am: 38d97f7882
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2301705
Change-Id: I55f13a8ae5bc858e5a42f400550329025cc17254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 13:23:23 +00:00
Sandeep Jawalkar
38d97f7882
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2301705
Change-Id: I66171e26c9b3dd44db9206dc15c286d0d404d54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 12:58:56 +00:00
Sandeep Jawalkar
5a34a5b3de
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary"
2022-11-18 12:32:01 +00:00
Bonian Chen
81e86e8d5d
Merge "[Settings] Code Refactor" am: bafd49d604
am: c31caafb5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239
Change-Id: I8dbda9c6b40fb8207b81b30e89e464eea87a06bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 12:31:54 +00:00
Bonian Chen
c31caafb5a
Merge "[Settings] Code Refactor" am: bafd49d604
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239
Change-Id: Iad870d2df6f9ecb2ff207b8753288da6446e218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 12:06:39 +00:00
Bonian Chen
bafd49d604
Merge "[Settings] Code Refactor"
2022-11-18 11:46:43 +00:00
Yi-Ling Chuang
2f80e073d0
Remove BatteryFixSlice as it's not used
...
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.
Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
Merged-In: I517cab71a32613d5cb5fcd3beb991a24926a2902
(cherry picked from commit e3fcf1f082
)
2022-11-18 10:58:42 +00:00
Wesley Wang
9a539a46d1
Invoke close() method for BatteryUsageStats to close cursor window
...
- Invoke close() method for BatteryUsageStats to close cursor window,
avoid OOM.
Bug: 245385410
Test: make SettingsRoboTests
Change-Id: I68f36a42a33d2546cb191cec88f5431e24dd5b84
(cherry picked from commit f164be387e
)
2022-11-18 10:19:07 +00:00
Bonian Chen
e1f641a130
[Settings] Code Refactor
...
Adjust code structure for maintainance.
Bug: 259611847
Test: auto test
Change-Id: I6710aa814441c0858c712f416ffddde44081d4d1
2022-11-18 08:36:53 +00:00
Joshua Mccloskey
db1ec87cb6
Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev am: 1d04eb6eb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20488559
Change-Id: I85f20ce7a8c0d4973cdcb42744bb7d04b9a7b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 17:25:44 +00:00
Joshua Mccloskey
1d04eb6eb7
Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev
2022-11-17 16:56:48 +00:00
Sam Dubey
48eae58586
Revert "Add configuration for defaulting notification behavior" am: a2d06273c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171
Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 14:01:32 +00:00
Bonian Chen
7dc161dcc8
[Settings] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Id5ea14ca888f0cfc6ed5a7df3f77a8176232ef4f
2022-11-17 09:01:09 +00:00
Sam Dubey
a2d06273c1
Revert "Add configuration for defaulting notification behavior"
...
Likely causing b/259499400
This reverts commit a92688d642
.
Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
2022-11-17 07:33:18 +00:00
Sayak Dutta
3765a09a58
Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c0477
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167
Change-Id: I580b3e0944fe2d232a11e73a7e349c6564debd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 06:19:40 +00:00
Sayak Dutta
03ed8c0477
Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev
2022-11-17 06:07:12 +00:00
Diya Bera
4688fd9074
Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435
Change-Id: I65f8405eda3e12b83a365bd469a3a0ce3f5c9f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 01:13:18 +00:00
Diya Bera
6c1eae8a1e
Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232
Change-Id: I3a0bcd951ba560a25e257f3dbe4c9657a1e82134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 01:12:56 +00:00
Diya Bera
b4a0a0563d
Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev
2022-11-17 00:59:35 +00:00
Diya Bera
dfe2bd2df2
Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev
2022-11-17 00:59:16 +00:00
Diya Bera
68903de369
Remove header "When using fingerprint unlock" for Udfps
...
Fixes: 257272989
Test: Manual - Open Fingerprint Settings and observe the UI
Change-Id: I98235e56a3537eff00490584c88f459ac755433f
2022-11-16 21:08:04 +00:00
TreeHugger Robot
c2e89dcdf8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 73348a8859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20493536
Change-Id: I9a4bd0ddf5f03530d0341a999fa9f7c7957cc746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 20:55:09 +00:00
Bill Yi
3cccae71eb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ece082dcaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20493536
Change-Id: Id36d81341d34e6d08f6a9c6da0465e7edab36b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 20:54:54 +00:00
TreeHugger Robot
2f21a74dc2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 30522878e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20493537
Change-Id: Id1904498bdae09ab404a90553efd70d550dfe108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 20:53:24 +00:00
Bill Yi
34bf7191c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 544000b27b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20493537
Change-Id: I00eb32fcc48c524b76eb6e73da8cdebd2b088a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 20:52:56 +00:00
TreeHugger Robot
73348a8859
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-16 20:36:20 +00:00
TreeHugger Robot
30522878e9
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-16 20:18:50 +00:00
Diya Bera
c4b95de536
Device displays fingerprint enrollment after swiping back
...
Fixes: 259198369
Test: Manual - repro steps in bug
Change-Id: Ide7fa0d16daba795cfc3c63a5da351000f918a81
2022-11-16 18:34:26 +00:00
TreeHugger Robot
6dd4a1c56c
Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20490498
Change-Id: Icd89903269969d665772c55f6edb42e7ffd7fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 14:28:36 +00:00
TreeHugger Robot
2904ea9410
Merge "[Settings] Fix merge confliction" into stage-aosp-master
2022-11-16 13:42:53 +00:00
Bill Yi
544000b27b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03421835110a4f99b59f5718e078f167c2b44443
2022-11-16 05:10:21 -08:00
Bill Yi
ece082dcaf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iabd3b4c4146bec3960af589135f39a5e2fe96d03
2022-11-16 05:04:31 -08:00
Treehugger Robot
1b70bcbdc4
Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
am: 425521478a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183
Change-Id: I84c783493a82247653fdc60932a0383d0c74d61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 09:40:56 +00:00
Treehugger Robot
425521478a
Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183
Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 09:08:59 +00:00
Treehugger Robot
adb5c5025a
Merge "Make p2p start searching after turning off airplane mode."
2022-11-16 08:23:44 +00:00
Bonian Chen
5c595b3789
[Settings] configuration for hidding SIM notification UI
...
Hide SIM notification UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I1b88f0f70f1b7487163849abfce93dbbc35c9ff9
2022-11-16 08:09:37 +00:00
Bonian Chen
20bcb7c5fb
[Settings] Fix merge confliction
...
Follow code reviewer's suggestion to further split the code.
Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
2022-11-16 07:57:37 +00:00
Binyi Wu
5b4cae3900
Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454690
Change-Id: I1b60ec07a8eb8efae0859051c923adb13bf07e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 07:55:53 +00:00
Pasty Chang
1d4e011f41
Migrate ambiguous getId method into getLink
...
The method name getId in setup library LinkSpane would be changed to the name getLink, so migrate the app that is used to getId to getLink.
Bug: 256095678
Change-Id: I2f9d58d82d99775575249e9e245949a0bc1d553e
Test: manual
2022-11-16 07:18:01 +00:00
Binyi Wu
d5d2dc4e22
Merge "Update survey triggering mechanisms" into tm-qpr-dev
2022-11-16 07:13:53 +00:00