Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,795 Commits 1 Branch 0 Tags
f98450da48d54e9f02e005fbb5832bbd2fc43359
Commit Graph

73795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f98450da48 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 am: 983db0546e am: 14b8a94a4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I2509930467cdd55497078997507bd8d3803b49da
 2020-06-26 04:53:49 +00:00
TreeHugger Robot
14b8a94a4b Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 am: 983db0546e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I54c71ed9814d809ddf366460f935bc9d6cad0f81
 2020-06-26 04:43:43 +00:00
TreeHugger Robot
983db0546e Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I20b7aefc9903871bfa29b7319fbe86fb8d580afe
 2020-06-26 04:26:51 +00:00
TreeHugger Robot
90d1b94c90 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: If0538a0f9b7fb4f1f561764de0293b3cb840f910
 2020-06-26 04:04:29 +00:00
TreeHugger Robot
7d20757118 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I733e3271f14ccadea76736043af88c8be4e62298
 2020-06-26 03:44:32 +00:00
TreeHugger Robot
7a97493f94 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev 2020-06-26 03:25:46 +00:00
TreeHugger Robot
dc62003440 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5 am: 2077575fc3 am: 093e22791b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I5e390b04dd9014ca7f3c6628c838537caf4edf28
 2020-06-25 18:51:45 +00:00
Automerger Merge Worker
8f373c2bd3 Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8 am: bfed274495 am: 2793bd2e59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: Ibd5dafc9b18811bc8cbc8a07b844ec22faa7ef12
 2020-06-25 18:50:48 +00:00
TreeHugger Robot
068e0af968 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b am: 61a2186e89 am: f0725a990c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I6ae9c1e10588462a18a96850a87e78096e6dcf67
 2020-06-25 18:50:31 +00:00
TreeHugger Robot
093e22791b Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5 am: 2077575fc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: Id5848bb6fefe1a98916736d4255168dbb37a12cc
 2020-06-25 18:40:04 +00:00
Automerger Merge Worker
2793bd2e59 Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8 am: bfed274495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: Ibf1f203ab844d87ebeb11c6bcbf13fc7694a7bab
 2020-06-25 18:39:53 +00:00
TreeHugger Robot
f0725a990c Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b am: 61a2186e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: Idc15ce9b22be74eb716b272b538474c2264287d7
 2020-06-25 18:37:35 +00:00
TreeHugger Robot
2077575fc3 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I332416dc1746113e637e687ef0e0b3149573dac3
 2020-06-25 18:26:05 +00:00
Automerger Merge Worker
bfed274495 Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I486fbac541d9f515f131fff5af7fb65e66416e60
 2020-06-25 18:25:44 +00:00
TreeHugger Robot
61a2186e89 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I103593c76f3968ca9e5d77ee02cfdbb67819aa4a
 2020-06-25 18:25:23 +00:00
Automerger Merge Worker
3ae447fac8 Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp 2020-06-25 18:14:22 +00:00
TreeHugger Robot
cb6694fceb Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I9e03c8066fb014c5d23e5f62245e58e8a09dcb09
 2020-06-25 18:14:17 +00:00
TreeHugger Robot
134254ee2b Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I443d14c0bc5a2003719de13c230ba957795d263d
 2020-06-25 18:14:14 +00:00
TreeHugger Robot
88b88439a5 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: If0a64a5a2e31e18b735434d2ae7ae35dcfb75f79
 2020-06-25 18:13:36 +00:00
TreeHugger Robot
0d26f24dbf Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: Ibf305c1ffb9e687d0b5c02e2ffab90b7d9212743
 2020-06-25 18:00:48 +00:00
TreeHugger Robot
6983516124 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I058262a8dc2df77c41f1a4621a16b12b3ac3b3d9
 2020-06-25 18:00:36 +00:00
TreeHugger Robot
77dcc34b26 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev 2020-06-25 17:19:44 +00:00
govenliu
67bb31fb8e [Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case am: d9644462fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11997024

Change-Id: I8ad42ac8e1dad3104fca5fd03a2707b50ff50337
 2020-06-25 15:41:22 +00:00
govenliu
d9644462fa [Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case 
onDestroy_quitWorkerThread in AddAppNetworksFragmentTest failed due to java.lang.IllegalStateException: no event down from INITIALIZED
Solution: Initialize fragment before calling the onDestroy API.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I80d28c6e7490a36a7ff26313d30d33b2f7d727c1
 2020-06-25 19:37:12 +08:00
TreeHugger Robot
edb361e324 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6 am: 239e85e5ba am: 602b8573f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ia4a1d3626394461efd4272af831d4e2b216aee7c
 2020-06-24 19:01:50 +00:00
TreeHugger Robot
e5dc0c8ab7 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b am: 2b836447a0 am: 1b9774f8b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ib4d38a04a9c6d09ccfd2baa19a279e2124bff261
 2020-06-24 19:01:44 +00:00
TreeHugger Robot
f3aeb54c8b Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be am: a7973d6b40 am: 24bae851a4 am: ce7b8288e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I9c3b592958aedbdbf0de1b0611bfb280fd71c428
 2020-06-24 19:01:31 +00:00
TreeHugger Robot
602b8573f3 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6 am: 239e85e5ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ieed559b6cc440d00c170d914452aa9c5ed7c5485
 2020-06-24 18:46:32 +00:00
TreeHugger Robot
1b9774f8b9 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b am: 2b836447a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Idad23ec72e13904b0fb2cbe4ab871a97b39aa1bc
 2020-06-24 18:46:24 +00:00
TreeHugger Robot
ce7b8288e7 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be am: a7973d6b40 am: 24bae851a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Id164f0196f5136aad61580a3e2272fea1057a374
 2020-06-24 18:45:51 +00:00
TreeHugger Robot
239e85e5ba Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I5e621eadc6f6d65b46a27e3e9462ca07d2797c16
 2020-06-24 18:40:40 +00:00
TreeHugger Robot
2b836447a0 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Id780eb12a2500866fbe4cc1ebb956d61362a0dea
 2020-06-24 18:34:48 +00:00
TreeHugger Robot
24bae851a4 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be am: a7973d6b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ic12249225eab906eb0700ea44f683572938f28b5
 2020-06-24 18:34:22 +00:00
TreeHugger Robot
5b199b3e1b Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I2f4e898413f9622649192d90163d9e3e9470ac07
 2020-06-24 18:29:16 +00:00
TreeHugger Robot
1a499b0fe6 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I9cc82154ea1efb0d2d9d5c6648a7fa03f2a7f3ca
 2020-06-24 18:29:14 +00:00
TreeHugger Robot
a7973d6b40 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Icabaf7cd378c5c8ce624d40f74cdd2e8af234662
 2020-06-24 18:23:12 +00:00
TreeHugger Robot
1230f90999 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I528105c4e1fd7eba294f6bcd7f735711a63c7e12
 2020-06-24 18:10:56 +00:00
TreeHugger Robot
1172dcd5be Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ifab97862a30669ca741d7527092905ea8c777b37
 2020-06-24 18:10:40 +00:00
TreeHugger Robot
1b57d227bd Merge "Increase char limit for translations" into rvc-dev 2020-06-24 17:59:39 +00:00
Beth Thibodeau
5e402df833 Increase char limit for translations 
Fixes: 159629315
Test: compiles; comment change only
Change-Id: I59a72a2de26cdb33002138ba0e9eaf4e58ecd3c1
 2020-06-24 12:03:06 -04:00
TreeHugger Robot
16f2336e51 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: e4cda91ccd am: 78cd92a48e am: edc59dbe5b am: 119ba1ff3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: Ica1c5dc823c29e21896821ee4653f53327d7e9c2
 2020-06-24 13:47:09 +00:00
Automerger Merge Worker
d58ca93fd0 Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5" into rvc-qpr-dev-plus-aosp am: 94d45c4800 am: e74faa8aee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I6a9bfcfe21612c5a047278ba690175b9dd9f9465
 2020-06-24 13:47:03 +00:00
TreeHugger Robot
195fd2cdd9 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3 am: 860b59d252 am: a59dd0b72b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I1912100c097d8e0a570287b3f389d5c2d57dbd30
 2020-06-24 13:46:56 +00:00
Automerger Merge Worker
5ce00a6be6 Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp am: dc8f57f4b5 am: 41aea005dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Iaccc858136d6b92e14605f053aa72183b34e0aea
 2020-06-24 13:46:51 +00:00
TreeHugger Robot
45fa1dfc04 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 821d3a21f1 am: a12e479403 am: 5cfe658988 am: e929104d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ib2be7e58f9cad608ca17855042594e5c9a16c685
 2020-06-24 13:46:43 +00:00
TreeHugger Robot
fac18e89be Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: adb65f0f4e am: bd06683934 am: 952816df60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ie78ee6a05d27dc2bb20354186ce397195ef43860
 2020-06-24 13:46:33 +00:00
TreeHugger Robot
119ba1ff3c Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: e4cda91ccd am: 78cd92a48e am: edc59dbe5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: Ice0be870f0e6f296d7268f0491bcc82d7da44efb
 2020-06-24 13:34:12 +00:00
Automerger Merge Worker
e74faa8aee Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5" into rvc-qpr-dev-plus-aosp am: 94d45c4800 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I16e9ce1d8f37356a9453a1a992cae5c7b3caf1b7
 2020-06-24 13:34:04 +00:00
TreeHugger Robot
a59dd0b72b Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3 am: 860b59d252 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I8ffe35c06d1bdb2f70709927b97c1677ed419456
 2020-06-24 13:33:53 +00:00
Automerger Merge Worker
41aea005dc Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp am: dc8f57f4b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I25bad13ae689d54484e960a0e7cfde55aab6e3e9
 2020-06-24 13:33:45 +00:00