Commit Graph

91201 Commits

Author SHA1 Message Date
Tom Hsu
9a072482ec Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: Ie5748b5a7829dc2bb2b86954c3815a03badc120e
2021-07-01 08:33:39 +00:00
Alex Johnston
4055c9b50a Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I835cc2dbc956bd53b10acc2c73b0de9069bc740c
2021-07-01 08:33:34 +00:00
Wesley Wang
dccdce75bb Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I1fb9bac630efc5d6e617e38b40728b94ff0073b3
2021-07-01 08:33:28 +00:00
Tom Hsu
c951604e5f Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: I50a5b75662943db9735b24aca9901e34de2ff537
2021-07-01 08:32:53 +00:00
Tom Hsu
a3852ffc75 Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: I019ad9d7712f15f1aa4ce548cde7a60cc8b283c4
2021-07-01 08:32:51 +00:00
Alex Johnston
ab4f1de8f3 Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I5b7855ecd5a5fe647deb6dd2df06dd5c803a5f38
2021-07-01 08:32:46 +00:00
Alex Johnston
486cbe6311 Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I04d07829b96c3b333d2f40b3a9d03741af85cbdb
2021-07-01 08:32:46 +00:00
Wesley Wang
38c4b3d1b0 Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I8f6a1f8cdb11ba2886f3d04f1bace113c78e08d7
2021-07-01 08:32:41 +00:00
Wesley Wang
15d004a5b8 Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I45d64bd2ae2014c89092635ca71528955f0e6883
2021-07-01 08:32:38 +00:00
Tom Hsu
f5a55229fa Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev 2021-07-01 08:28:15 +00:00
Alex Johnston
4174cf1b28 Merge "Fix Settings usb preference search" into sc-dev 2021-07-01 08:26:51 +00:00
Wesley Wang
ddc8a5db98 Merge "Update high usage tips string" into sc-dev 2021-07-01 08:22:11 +00:00
Jason Chiu
604a803b4e Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad am: e1de78a270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I92de90842c61b32669ae9f52e01f74496eda2949
2021-07-01 07:54:52 +00:00
Jason Chiu
b06fc98859 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84 am: 0ee32dcd2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I750b5d50b3fbdd7153aea85d7df36f0bce4e3715
2021-07-01 07:54:45 +00:00
Jason Chiu
ae1fc0dada Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: 8cdbad13e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I741bfd7d164924d30f32ab0567bdcd85875e35d3
2021-07-01 07:50:05 +00:00
Wesley.CW Wang
15ca9a632f Update filter logic for BatteryDiffEntries
- Use user id and package name to query the battery entry list instead of uid, to handle the
 cases which enter app info page without uid like launch icon -> app
 info

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I665e57ff3eabf23485455fb2e1af2e0376af1e40
2021-07-01 15:48:23 +08:00
Jason Chiu
e1de78a270 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I189c81e167c158a513bc4e0df8e9c4f039057ccb
2021-07-01 07:42:40 +00:00
changbetty
767681812b Set the attribute of the dialog window for overlay QS internet panel
Bug: 190460969
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test

Change-Id: I1acdfb09393163bb94824fe2b3bad0391ba4fb53
2021-07-01 07:41:11 +00:00
Jason Chiu
0ee32dcd2b Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: Ie292d02ec2bb04aaa903d64003bedf8416c207f2
2021-07-01 07:37:26 +00:00
Jason Chiu
8cdbad13e6 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I198d2557bbd966d105e7a8daf8665b3a10d26536
2021-07-01 07:36:50 +00:00
Jason Chiu
d24ee9c0ad Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I9f806b71618c2447ddf9ad2322f9971ea3b1d89c
2021-07-01 07:25:42 +00:00
Jason Chiu
ab902d4d84 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I14b3f1890c9b278f21e781c2a9348d57528e8b29
2021-07-01 07:24:42 +00:00
Jason Chiu
a460e4f890 Update title and subtext of Contact search in Work profile settings
Test: visual
Bug: 184610902
Change-Id: I5391ce3c1dc4aef6ec9e840f382d74a6a399e562
2021-07-01 07:22:40 +00:00
Jason Chiu
1f4eb8fbcc Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev 2021-07-01 07:10:56 +00:00
changbetty
b453e44bf8 Add Adaptive Connectivity switch on/off string for fixing string gender
Bug: 189234188
Test: Manual test
Change-Id: I8a3df2a0f4b364e4bc31e0efd116312b5fdf3b42
2021-07-01 14:57:52 +08:00
tom hsu
a8456b4aa9 [Settings] Make UI be able to update current status, after SIM absent.
- The cache of default data subscription id does not update when SIM
 absent. Therefore, uses getActiveSubscriptionIdList instead current to
 make it more precise.

Bug: 192032602
Test: Manual test. see b/192032602#7
Change-Id: I29e697e97d32ecb2e93c9620ec65215f963e4ebe
2021-07-01 05:35:46 +00:00
TreeHugger Robot
7a108c2d01 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: dfb8409116 am: 325a4da467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ifea0933ba36e56ce1de25816b8d56557ae965e7b
2021-07-01 03:27:17 +00:00
TreeHugger Robot
52c03c33a3 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: 2ddfd5616d am: 0af4260cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Iddd2fa66e062d0209c00bc0029bcbab9ec9a93a9
2021-07-01 03:27:01 +00:00
Syaoran Kuo
1eaddbac90 Merge "Fix dark mode activity in incorrect stage exception" 2021-07-01 03:10:38 +00:00
TreeHugger Robot
325a4da467 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: dfb8409116
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I8c613a0fbed0331c83856c8ca502cd2ab636b895
2021-07-01 03:03:54 +00:00
TreeHugger Robot
0af4260cb3 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: 2ddfd5616d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I2ccdd29729b1cdfdf6189ca4137e70074bccbbc5
2021-07-01 03:03:29 +00:00
TreeHugger Robot
c1d51336ee Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: ca65634d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I4efe13f97a27670a0dbec376c8e2072cd26699ea
2021-07-01 03:03:28 +00:00
TreeHugger Robot
2ddfd5616d Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I35fcc3939777cf9b62800a853c5e9746097fdc9b
2021-07-01 02:50:51 +00:00
TreeHugger Robot
ca65634d48 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ica04ca516c5d315a0844cfa3bfda0c9511f50cb4
2021-07-01 02:50:30 +00:00
TreeHugger Robot
dfb8409116 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ibf6c9652f206bc9803ffd56a6b3d5a651ea3d149
2021-07-01 02:50:00 +00:00
TreeHugger Robot
f421525d2c Merge "Fix ManageApplications pinned header overlaps content" into sc-dev 2021-07-01 02:38:18 +00:00
Joe Bolinger
14cf3724f7 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: de779f2883 am: 37b0e414ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I11a8bb874443ffd56412fe97624d19ea413cd0e9
2021-07-01 00:30:08 +00:00
Joe Bolinger
802e971dc1 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: a095d7f518 am: ce952ecd28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I0db89f89078a31593139820ca077781520222e83
2021-07-01 00:30:07 +00:00
Joe Bolinger
35dd8a5f09 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: f914e82e8c am: a4642cb1a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I257992d7b752762ce8a85dd6ed2cb9e3858f0255
2021-07-01 00:29:57 +00:00
Joe Bolinger
d90650e816 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: 7944bfa26b am: 33efdd7fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I4b35dd99fbb98ac9b13591aad5d83374c115e950
2021-07-01 00:29:55 +00:00
Joe Bolinger
37b0e414ad Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: de779f2883
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: Id2c46bdd112f0255cf868fc0e1b3e00bea08b66e
2021-07-01 00:20:01 +00:00
Joe Bolinger
ce952ecd28 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: a095d7f518
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I7b249e802c07786ecfff6ee1b86a45296178cc91
2021-07-01 00:20:00 +00:00
Joe Bolinger
a4642cb1a5 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: f914e82e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I7413a708c4814cd73c44caeefcb9e85aa644e648
2021-07-01 00:16:32 +00:00
Joe Bolinger
33efdd7fc7 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: 7944bfa26b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I45574652f03e2ab0ac7d51e6f5d4964429e9851f
2021-07-01 00:16:30 +00:00
Joe Bolinger
290a7afb74 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: ab597936fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: If8138b690a5f95554dd8d97cfc8f17226c2bd93e
2021-07-01 00:15:53 +00:00
Joe Bolinger
06af467c5c Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: df329ea588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: Ic84cdee418c7b2bf7c476441cac795cfa58545ab
2021-07-01 00:15:48 +00:00
Joe Bolinger
f914e82e8c Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I7e8bd7d8311ec387073de14eb334f5ec24f480e5
2021-07-01 00:03:19 +00:00
Joe Bolinger
7944bfa26b Revert "Revert "Return enrollment consent status to caller."" am: c17876365a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I9bfcd58aee6c2dca25f1b229762c0a19e4a883b1
2021-07-01 00:03:17 +00:00
Joe Bolinger
de779f2883 Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I37dfd3cd27fb0952db602a60663b83b911e616ba
2021-07-01 00:02:34 +00:00
Joe Bolinger
ab597936fe Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I3e36919892194b12ed4d3567715c87fcad8d5065
2021-07-01 00:02:33 +00:00