Bonian Chen
3150fa819d
Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
am: f901e617c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: Ie51d253cc9be1c313fc2fd88d875305b3fd9dd86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:33 +00:00
Bonian Chen
6242806577
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597
-s ours am: 5104a1bee0
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I4c37d3ad1d003f47558e5bb825dbb347d02e90c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:32 +00:00
Bonian Chen
32b9504f73
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8
-s ours am: 5b9e71b0c5
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Id247dbbd5b5fad1219825861d0d528d0e8dc7074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:31 +00:00
Bonian Chen
aa7fcd1c05
Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
am: 2a98e2a4fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: I7acaa73cec8fb623a9d9db6a524e86acb48d5cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:22 +00:00
Bonian Chen
0a733a9ed9
Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a
Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:14 +00:00
Bonian Chen
e1d5ccf789
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: I4fe15b89021796089a625b3474dec0de68302e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:12 +00:00
Bonian Chen
933dbbd5a4
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Ib9c1e811a17bc7923467b6f0c846aac7c6e804fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:11 +00:00
Bonian Chen
f901e617c1
Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:09 +00:00
Bonian Chen
5104a1bee0
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Id886c8f56c33571dcfca29741d50e248babe8218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:08 +00:00
Bonian Chen
5b9e71b0c5
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I39b6582327344a55219b960285add58422f69ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:06 +00:00
Bonian Chen
2a98e2a4fe
Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997
Merge "[Settings] configuration for hidding SIM settings UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a
Merge "[Settings] configuration for hidding SIM remove UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a
Merge "[Settings] configuration for hidding SIM notification UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4
Merge "[Settings] configuration for hidding SIM provider UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597
Merge "[Settings] configuration for hidding SIM related UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b
Merge "[Settings] configuration for hidding SIM lock UI"
2022-11-22 08:51:53 +00:00
TreeHugger Robot
6c7910557e
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f
Merge "Adds settings item for quick affordances." into tm-qpr-dev
2022-11-22 02:59:15 +00:00
Alejandro Nijamkin
01df2b4ee2
Adds settings item for quick affordances.
...
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.
Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen
Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Steve Elliott
30ccc43ae1
Revert^2 "Add configuration for defaulting notification behavior"
...
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00
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
Android Build Coastguard Worker
666f91e03a
Snap for 9312338 from 06125115a0
to tm-qpr2-release
...
Change-Id: Iccd4de1263b95f9dfdb9bfeccf2aed670d1bec5d
2022-11-19 22:37:54 +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
Android Build Coastguard Worker
1a40a9e6e7
Snap for 9305793 from 1d04eb6eb7
to tm-qpr2-release
...
Change-Id: I9bd9976b4d7cefc9c4cc26988e40fdd5f604f393
2022-11-18 00:30:39 +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