Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,200 Commits 1 Branch 0 Tags
e8bb21dde2fac573a92bd0eb832d6e8f7e57d28f
Commit Graph

84200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
e8bb21dde2 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Ib425e48777ea0088798c6f1fc37af1f24b609c9a
 2021-06-25 02:21:36 +00:00
Bonian Chen
f9aa12f4d9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev 2021-06-25 02:17:59 +00:00
Bonian Chen
49e4eb1151 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: Id8a5e8f5fecb64d087bbadb3b02c6f638bf6ba81
 2021-06-25 02:16:58 +00:00
Bonian Chen
7b8e05adab Revert "[Settings] Code Refactor - ActiveSubsciptionsListener" 
This reverts commit 2a1344a50e.

Reason for revert: Missing some files which would lead to build breakage.

Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
 2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev 2021-06-25 01:59:05 +00:00
TreeHugger Robot
be8c22ca76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a842384ca11e4bf25585941a48e734599135fb0
 2021-06-24 20:41:38 +00:00
TreeHugger Robot
54c1ff8489 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 20:25:56 +00:00
TreeHugger Robot
4b811bbe2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0bc45d18a5a5ad32d977f2c1d5882710676a210
 2021-06-24 20:18:41 +00:00
Bill Yi
d8c874e5c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f329c4702d335f325c18b3f6c7d44734ebc4fde
 2021-06-24 20:18:37 +00:00
TreeHugger Robot
b8bd54cd94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I157969d7a1a3f3b5cab29f3e9ecec9e3c89dba92
 2021-06-24 20:14:39 +00:00
Bill Yi
3e45d30cfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9e55bbaf2f5d03312deca10c09c21658eb7fb2d
 2021-06-24 20:14:30 +00:00
TreeHugger Robot
8acff55c46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I864d92ebb5b96acfbfb11d67f69a11487a2841d9
 2021-06-24 20:14:23 +00:00
Bill Yi
8068e3e113 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I704abc5fc36321a1c17d389e31c3f2fcff9dee23
 2021-06-24 20:14:18 +00:00
TreeHugger Robot
43314e95e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fce26fc05303b095d38f37ed2d47fcde834c66b
 2021-06-24 20:14:09 +00:00
TreeHugger Robot
0e1287502f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaea10d18ec08b69975f0f172e3b1fc282f8db64a
 2021-06-24 20:14:05 +00:00
Bill Yi
06ffb62957 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic10837a5f31ad798d1b9d43cadf6eb52300e4975
 2021-06-24 20:14:00 +00:00
TreeHugger Robot
566af4c8b9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:45 +00:00
TreeHugger Robot
9a5c27355b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:43 +00:00
TreeHugger Robot
483f978ba7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-24 20:02:41 +00:00
TreeHugger Robot
fa6b455bd0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-24 19:58:49 +00:00
TreeHugger Robot
edeef947e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 19:56:59 +00:00
TreeHugger Robot
5c134ad624 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I2a8343d2c07d916eb12c83dbe8bd6efa2f00df12
 2021-06-24 18:32:06 +00:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +00:00
Curtis Belmonte
af954c7351 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: If8d3f4f71691384312efbbb032f776a123feb307
 2021-06-24 17:59:00 +00:00
Curtis Belmonte
4de89a9361 Merge "Use correct string for Face Unlock preference category" into sc-dev 2021-06-24 17:47:14 +00:00
Bill Yi
e93a98e06b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95f8f317ddf4f40de75a9d7171960ca430dc0cd9
 2021-06-24 15:47:17 +00:00
Bill Yi
a83bc881f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
 2021-06-24 15:37:57 +00:00
Bill Yi
1ff9267e5a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idda50c4476939eb34180e330eb2d8ffc1ceebafe
 2021-06-24 15:33:28 +00:00
Bill Yi
342b2ae851 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8d9a3522550591b80fc7cd8470d939c324443ef
 2021-06-24 15:29:50 +00:00
Quang Luong
5f5068f6df Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ia04e46f443afce296bd76ffa85da4bd0647390d2
 2021-06-24 15:27:02 +00:00
Bill Yi
3da973faed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibd34c0c0ecbfb43f927e0a2ce5e096f535d71f4a
 2021-06-24 15:24:29 +00:00
Bill Yi
8198514a9f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I94d39b7145cec9ac42f49e6debb051cfe5fa59c6
 2021-06-24 15:20:40 +00:00
Bill Yi
9ade421c94 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icd1a1e0004c3448bac3883d659e46ad1e08861fa
 2021-06-24 15:17:05 +00:00
Bill Yi
a6df60ab6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifff56e70e67db8993c9fd789cdb86c471172329e
 2021-06-24 15:15:22 +00:00
Quang Luong
afc0bd763c Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev 2021-06-24 15:12:38 +00:00
Jeff Sharkey
74446ce412 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: Ib9248964e06dc6754a1ad347f04757a04d4bbe19
 2021-06-24 15:01:59 +00:00
Jeff Sharkey
5b7518fdf7 Merge "Update to modern Bluetooth permissions." into sc-dev 2021-06-24 14:44:28 +00:00
Wesley Wang
8750191782 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: Ia1cc369b22cdc90d55a00e405d923e45b94d95d3
 2021-06-24 13:56:49 +00:00
Wesley Wang
31428e9dc5 Merge "Remove unnecessary converting us to ms" into sc-dev 2021-06-24 13:45:16 +00:00
TreeHugger Robot
3f18f97154 Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

Change-Id: I2b4b28849a27f4805bd204b0a5bc2eea11528744
 2021-06-24 13:37:10 +00:00
TreeHugger Robot
e7b17ece47 Merge "Fix a flicker problem on top app bar" into sc-dev 2021-06-24 13:32:55 +00:00
Alex Johnston
9beb22936e Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I9aa3dc5a899d3862f7ca7df86bbfc0a3b9f1ecef
 2021-06-24 13:11:56 +00:00
Alex Johnston
901617e37d Merge "Update CA certificate warning to material next spec" into sc-dev 2021-06-24 12:59:14 +00:00
Wesley.CW Wang
273a7d96a3 Remove unnecessary converting us to ms 
- Pick from pagit/1951738
 - 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
Bug: 184916537
Test: make RunSettingsRoboTests
Change-Id: I2e8e03451352d7ad4cd44f72d5261dad35a81eb9
 2021-06-24 11:41:53 +00:00
Prochin Wang
9f5abd16de Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: I033dc319ec7f1142fd9608cceb86cd2589960532
 2021-06-24 09:35:02 +00:00
Prochin Wang
1ff0fe1d5a Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev 2021-06-24 09:24:02 +00:00
TreeHugger Robot
68bc21c508 Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925

Change-Id: I44e8114f3ef5f1b2abf3f51b809773189e53ab2e
 2021-06-24 09:09:39 +00:00
TreeHugger Robot
37b1831d0d Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev 2021-06-24 08:57:58 +00:00
prochinwang
b6b2485796 To hide the soft input window when press skip button on Skip setup for 
PIN and face dialog of Set a PIN screen to avoid flash during transition.

bug:191181054
Test: SUW
Test: make -j RunSettingsRoboTests

Change-Id: I229b190de5e6dc714bbb8408e91c363e90b18f30
 2021-06-24 08:52:25 +00:00
Arc Wang
0358562a9b Revert "Fix 'No Apps' UI issues of ManageApplications" 
This reverts commit 4a97095e36.

Reason for revert: <It has abnormal scroll behavior when there is no profile tab>

Bug: 191945032
Bug: 191944934
Change-Id: Id6c71fbec4f490034bc07f6d8c9efabcb877d110
 2021-06-24 08:25:44 +00:00