Treehugger Robot
|
e9e4c5bc6a
|
[automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 am: 3210089fc6 -s ours am: df5a05a704 -s ours
am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd1a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: Ic2a0651aa5f77910fce7b7d63a09a24b6e18b674
|
2022-02-08 11:46:49 +00:00 |
|
Raj Garg
|
949ee0518c
|
Merge "Adding configuration to timeout for "Android is starting message""
|
2022-02-08 10:47:19 +00:00 |
|
Treehugger Robot
|
df5a05a704
|
[automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 am: 3210089fc6 -s ours
am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd1a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: If4a72056e659579e6ed6928df26a7cf5f6155b43
|
2022-02-08 10:33:06 +00:00 |
|
Treehugger Robot
|
3210089fc6
|
Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: I9f8bb883a0fa1d902144fbf1f4aba9f03f623728
|
2022-02-08 09:52:04 +00:00 |
|
Treehugger Robot
|
6040d46cb0
|
Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: If94e29e72c3ce461e27d028148d2c0e4bdbba9e9
|
2022-02-08 09:36:17 +00:00 |
|
Treehugger Robot
|
17e8159641
|
Merge "Settings: Fix FC when learn more textview help intent is NULL"
|
2022-02-08 09:15:53 +00:00 |
|
Tom Hsu
|
64e203ad43
|
Merge "[Panlingual] Add PackageManager api to Per app language."
|
2022-02-08 07:05:29 +00:00 |
|
Jack Yu
|
387566c7d3
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 3e076f98b5 -s ours am: 658476219d -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I4d8cefbc0952cae4282f5ff6586a28255aa0b8d1
|
2022-02-08 04:06:31 +00:00 |
|
Jack Yu
|
cc53a54f0a
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 1b4a91414e -s ours am: 00682396b3 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ibacc48f6e26ae5d7d5c2522d08c27b7b47b8f7e5
|
2022-02-08 04:05:44 +00:00 |
|
Jack Yu
|
658476219d
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 3e076f98b5 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I0e64f8d20e1849696f759b1a19feb7f6eae6ddfc
|
2022-02-08 03:48:08 +00:00 |
|
Jack Yu
|
00682396b3
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 1b4a91414e -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I2ca009158991817d9bb19fe59a9be319bbb97505
|
2022-02-08 03:47:55 +00:00 |
|
Jack Yu
|
1b4a91414e
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I4efdd94e0ea6979f90dc47df191412b177a2325a
|
2022-02-08 03:31:02 +00:00 |
|
Jack Yu
|
3e076f98b5
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I3c907ca25472d4bd87a09599d67aac7f480ef71c
|
2022-02-08 03:31:02 +00:00 |
|
Jack Yu
|
4536cb07ab
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: 93bb6265de -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ie70cae0b6f11fdd5a97afddcf97f2e205d2f5758
|
2022-02-08 03:29:45 +00:00 |
|
tom hsu
|
b48802c152
|
[Panlingual] Add PackageManager api to Per app language.
Bug: 216099500
Test: atest pass
Test: local test with Settings app
Change-Id: Icbdb1475d45e0652de369711ea21b5043f36dc19
|
2022-02-08 03:25:03 +00:00 |
|
Jack Yu
|
b3762ca5f4
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I8654c830eaebe72d6f84f8966c43ea74979b14af
|
2022-02-08 03:12:04 +00:00 |
|
Jack Yu
|
93bb6265de
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I1aeb78925da456f0b112ef60a7b5d3c6fc51aea2
|
2022-02-08 03:10:51 +00:00 |
|
Jack Yu
|
5163fd7aea
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ie7899cd8137c524e3fd39a0b50016fbae5d37120
|
2022-02-08 02:59:06 +00:00 |
|
Jack Yu
|
7093dea7f7
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I186c750238d8f159b2d33e309c2aa9badf60ff64
|
2022-02-08 02:43:45 +00:00 |
|
Jack Yu
|
cd6ce52ea4
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ief5899b4af766d3d1c9283e4a5a4500ff66b9009
|
2022-02-08 02:30:37 +00:00 |
|
Jack Yu
|
46bd9ba5a5
|
Do not let guest user disable secure nfc am: 4e543a38f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Iffe578c58bf2dcebda45b0b71dd901bd3e08be41
|
2022-02-08 02:15:55 +00:00 |
|
Etienne Ruffieux
|
0c2585b171
|
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0 am: b97acda5cf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: Ib50f9c12070e411d1582615ebe59985046f05ecc
|
2022-02-07 22:13:52 +00:00 |
|
Etienne Ruffieux
|
b97acda5cf
|
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: Idc59b3f953adab7686e532d36c66b12d21df995c
|
2022-02-07 22:00:46 +00:00 |
|
Etienne Ruffieux
|
28b1a9e4b0
|
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: I22908770a17e3cd3b3fe46c3192511d2f70d4fbd
|
2022-02-07 21:49:08 +00:00 |
|
Etienne Ruffieux
|
d020a96da1
|
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: I87f5bbb080291bbbf93bad56b77eefe2d67f37bd
|
2022-02-07 21:34:12 +00:00 |
|
Etienne Ruffieux
|
a6d4788fa0
|
Merge "Removed mocked BluetoothAdapter"
|
2022-02-07 21:17:41 +00:00 |
|
Dmitri Plotnikov
|
15a0b54d60
|
Merge "Remove uses of deprecated class, BatteryStatsHelper"
|
2022-02-07 17:33:57 +00:00 |
|
Remi NGUYEN VAN
|
f962acdb70
|
Merge "Remove dependencies on hidden network stats APIs"
|
2022-02-07 05:36:49 +00:00 |
|
Bill Yi
|
b2ac9d5c9f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: e1b12ea032 -s ours am: 4883417997 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I345ed31f56d239ecbb7c578d15e5b2ac9e14f2fa
|
2022-02-06 07:58:12 +00:00 |
|
Bill Yi
|
4883417997
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: e1b12ea032 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I7d7c1a488a13e6ad7df496f2a8316c2682d9a669
|
2022-02-06 07:44:49 +00:00 |
|
Bill Yi
|
c2828ad558
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: ea2313ee1c -s ours am: cd6a5bb9c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I90a9786dd6fd774715fab387ddb806e653234994
|
2022-02-06 07:32:26 +00:00 |
|
TreeHugger Robot
|
8536254635
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 13b64572bc -s ours am: da113335f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795303
Change-Id: I4c2b58b8d2221e6f45ab33ea2e31f6e5350d8254
|
2022-02-06 07:30:36 +00:00 |
|
Bill Yi
|
cd6a5bb9c6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: ea2313ee1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: Ifd09ecf5d27a5d17d7288c730bc684488c0a6981
|
2022-02-06 07:29:57 +00:00 |
|
Bill Yi
|
e1b12ea032
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I77c8fc97fc5c1f6fb03703273702ee297b407472
|
2022-02-06 07:29:40 +00:00 |
|
TreeHugger Robot
|
da113335f1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 13b64572bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795303
Change-Id: I92c13f749ba7d43837dfa06804d60c2fec4f063c
|
2022-02-06 07:29:26 +00:00 |
|
Bill Yi
|
ea2313ee1c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I9695f7995505937072075e5df2af755d80d3ce9e
|
2022-02-06 07:29:16 +00:00 |
|
Bill Yi
|
c5e57f2c00
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e5dcaa4 am: b3e23787a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795207
Change-Id: Ide5ccd91aa7eec7e3d459830b12b62c0b3515fc3
|
2022-02-06 07:28:23 +00:00 |
|
Bill Yi
|
9c24b9eb74
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e5004e48c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794073
Change-Id: I6e14a549dc97edd96fec518ab6242a39ce63222d
|
2022-02-06 07:21:42 +00:00 |
|
TreeHugger Robot
|
13b64572bc
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
|
2022-02-06 07:12:26 +00:00 |
|
Bill Yi
|
777dbb327e
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie96162d55ef258d966719e932be7a947990a43a7
|
2022-02-05 08:47:03 +00:00 |
|
Bill Yi
|
e7f361b3cc
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I66e97246a1e7cccda15c563a0001127629a0b684
|
2022-02-05 08:43:36 +00:00 |
|
Bill Yi
|
b3e23787a4
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e5dcaa4
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795207
Change-Id: I4e390f12bd6e5fe5ecb62177a66fd252cdd9a9c5
|
2022-02-05 08:32:57 +00:00 |
|
Bill Yi
|
6a7e5dcaa4
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I19ff499a6e3038abc71a90a83c0f3585e66685e9
|
2022-02-05 08:32:48 +00:00 |
|
Bill Yi
|
2e5004e48c
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ae1f5b9196148fdff2b5410dc81c0940fa63427
|
2022-02-05 08:25:54 +00:00 |
|
Steven Ng
|
d74f060971
|
Merge "Replace hard-coded bedtime action with Settings.ACTION_BEDTIME_SETTINGS"
|
2022-02-04 14:46:41 +00:00 |
|
Dmitri Plotnikov
|
457715b00d
|
Remove uses of deprecated class, BatteryStatsHelper
Bug: 217618527
Test: rebuild settings. DebugEstimatesLoader is actually unused.
Change-Id: Ic6ebda0d83bf7c8809f0f7cb40903a969c4b469a
|
2022-02-03 17:32:18 -08:00 |
|
Kevin Han
|
24d67e9a09
|
Merge "Hook up hibernation eligibility to exemption toggle"
|
2022-02-03 23:56:04 +00:00 |
|
Adam Bookatz
|
fd3c59aee2
|
Merge "Fix UserDetailsSettingsTest for mAppCopyingPref"
|
2022-02-03 22:36:12 +00:00 |
|
Xinyi Zhou
|
93da780888
|
Merge "Add Fast Pair saved devices settings preference"
|
2022-02-03 19:51:44 +00:00 |
|
Yasin Kilicdere
|
efede0db18
|
Merge "Set default name when creating a supervised user in fallback activity."
|
2022-02-03 19:35:14 +00:00 |
|