Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,523 Commits 1 Branch 0 Tags
631a63c3f4b817cb2894de92113be6bffe976fe5
Commit Graph

71523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
57f73fff09 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifa08bec0183dad1408feb27cef740edf3f5a3dd8
 2020-05-15 22:31:34 +00:00
TreeHugger Robot
3845234a31 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours 
am skip reason: subject contains skip directive

Change-Id: I78cc0de8eb4c709c7bb152be2f98c2967439243c
 2020-05-15 22:31:29 +00:00
TreeHugger Robot
ae2531ed5d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours 
am skip reason: subject contains skip directive

Change-Id: If4ea389a63795bc514a70a36fea853cedd8a252b
 2020-05-15 22:31:26 +00:00
Bill Yi
bda51c20a3 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: 90b6c14fd6 -s ours am: 88ab100293 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2dfc1472cc8a40f7c42381618aa1a2c45216fb05
 2020-05-15 22:31:13 +00:00
TreeHugger Robot
7b104cf937 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours 
am skip reason: subject contains skip directive

Change-Id: I57370de051c5d2fbe051e4c7f2faacea907624b9
 2020-05-15 22:30:46 +00:00
TreeHugger Robot
aa76705149 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:26:30 +00:00
Automerger Merge Worker
d0a105b3f2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours" into rvc-d1-dev-plus-aosp am: e5b64442ca -s ours 
am skip reason: subject contains skip directive

Change-Id: I9ff046ec2ab3c9fa22bd08261d491af80ab40274
 2020-05-15 22:16:49 +00:00
TreeHugger Robot
d53c21e60e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours am: 2bc446c98b -s ours 
am skip reason: subject contains skip directive

Change-Id: I9b7385ae0588b4cc38a2cd4f1a1a50dec91ba252
 2020-05-15 22:16:35 +00:00
Bill Yi
32c2cad56e [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours am: 7968c73b5b -s ours 
am skip reason: subject contains skip directive

Change-Id: I39d47104edf13f8e699c2f569053da054ad4cdd6
 2020-05-15 22:15:55 +00:00
TreeHugger Robot
95d020b526 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours am: c51e9b5864 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie2ef832047cf266dd4348c8670038589f61dc8e4
 2020-05-15 22:15:30 +00:00
Bill Yi
6688699058 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: c1567ea37b -s ours 
am skip reason: subject contains skip directive

Change-Id: Id47200ca980ab6b51735f626877e6432fee50e65
 2020-05-15 22:14:58 +00:00
TreeHugger Robot
f94e4f739e Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:14:41 +00:00
Bill Yi
88ab100293 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: 90b6c14fd6 -s ours 
am skip reason: subject contains skip directive

Change-Id: I71d9d9d568fed5ed5117137a0a282ee0c8d79768
 2020-05-15 22:14:31 +00:00
TreeHugger Robot
c51e9b5864 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic3115f588e544915f955227e48608d02a4036ee2
 2020-05-15 22:05:22 +00:00
Automerger Merge Worker
e5b64442ca Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours" into rvc-d1-dev-plus-aosp 2020-05-15 22:05:08 +00:00
TreeHugger Robot
14a4df4634 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I14506440b31334d87e2f029e6e596533a5fd7e75
 2020-05-15 22:05:03 +00:00
TreeHugger Robot
2bc446c98b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6e9617143d7d85efdd78eba3d3f34e00e1684c06
 2020-05-15 22:04:56 +00:00
Bill Yi
7968c73b5b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie479e750719702bf33a60e5bdc000cbaf60092e0
 2020-05-15 22:04:01 +00:00
Bill Yi
90b6c14fd6 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours 
am skip reason: subject contains skip directive

Change-Id: I85abce567222922e5b4c916ef34a95a207f62463
 2020-05-15 22:03:56 +00:00
Bill Yi
c1567ea37b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iff980ca90e1e8a5ddc1c5a773f74783af38acf0e
 2020-05-15 22:03:52 +00:00
TreeHugger Robot
489b78cae9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I22a5978bfb41a9ecc027bff2e8986353b7e4b46b
 2020-05-15 21:44:19 +00:00
TreeHugger Robot
10244a3ce0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I97d476e4022e9b78e43cd5f07a08fd5b7d3bb796
 2020-05-15 21:43:52 +00:00
Bill Yi
f9f0ee1539 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours 
am skip reason: subject contains skip directive

Change-Id: I1d0b0627353a635801a19c8db5e662bea41f50ef
 2020-05-15 21:43:44 +00:00
Bill Yi
9b1b0a9c75 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours 
am skip reason: subject contains skip directive

Change-Id: If32dd964132dfe8d0a8bb826a26734fa07909165
 2020-05-15 21:43:37 +00:00
TreeHugger Robot
e002abfb6c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours 
am skip reason: subject contains skip directive

Change-Id: I95387650d0f829bb6658ad0700c5d3fdff442595
 2020-05-15 21:26:30 +00:00
Bill Yi
3a86ceebae [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie3afdfd7a7e11ebcbe5ae7d699a1fbd4ff5fd3e5
 2020-05-15 21:26:23 +00:00
TreeHugger Robot
8e7fa0958a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-05-15 21:13:40 +00:00
TreeHugger Robot
866efbc033 Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment" am: 76215df1df 
Change-Id: I81a9a5753a3875db5170ada679972086408d91c4
 2020-05-15 20:27:39 +00:00
TreeHugger Robot
76215df1df Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment" 2020-05-15 20:11:05 +00:00
Julia Reynolds
f0c3245639 Fix jank on conversation screen 
Onboarding should only appear if needed

Test: manual
Fixes: 156756305
Change-Id: I663677772806db9c80979cdac103c9fa657ee7e2
 2020-05-15 19:41:12 +00:00
Julia Reynolds
cd237ccf9b Update conversation launch point 
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
 2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197 Add settings for apps that don't use full conversations 
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
 2020-05-15 19:38:14 +00:00
Kweku Adams
eb4786ed70 Migrate to PowerWhitelistManager. 
In preparation for DeviceIdle mainlining, we have to define stable APIs
for other modules and the rest of the system to use. This migrates to
the stable PowerWhitelistManager API.

Bug: 142420609
Bug: 144864180
Test: Android builds
Change-Id: Ic1006c03f3b73c2855fd127ee2cd7fff676caf3e
 2020-05-15 10:42:40 -07:00
Wang Han
719b573173 Fix NPE if default supervisor is not defined 
* Checking for null does not work sadly. This fixes NPE at
   calling who.compareTo(supervisorComponent).

Change-Id: Ie49df625b1514b1d1e5f8063db66dce4a5050039
 2020-05-15 14:06:11 +00:00
Automerger Merge Worker
cda2c58f1e Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba am: ec28e4e674 
Change-Id: I81546501e3889bfc2fde84089bf0a84942f9f725
 2020-05-15 13:07:38 +00:00
Yanting Yang
9ed7204d8b Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886 am: f28b7d3bbc 
Change-Id: Iabd9554db4c55ad8fe2723bc2259aa75560eb4da
 2020-05-15 13:07:24 +00:00
Yanting Yang
046925a043 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433 am: 838957c0f9 
Change-Id: I6aa1512a8d07bf65c7ab5ef5d15664010187b10a
 2020-05-15 13:07:12 +00:00
Automerger Merge Worker
ec28e4e674 Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba 
Change-Id: Ia919586571ea06e7776a0911b520f85f6192aff7
 2020-05-15 12:54:32 +00:00
Yanting Yang
f28b7d3bbc Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886 
Change-Id: I238d957b0980000598efa6a58e0a4f2bb36116a5
 2020-05-15 12:54:13 +00:00
Yanting Yang
838957c0f9 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433 
Change-Id: Ia51c13206f46b78aa7f23a86eb80683cc03d8af2
 2020-05-15 12:53:51 +00:00
Automerger Merge Worker
dc6d6624ba Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp 2020-05-15 12:31:46 +00:00
Yanting Yang
3fee8e0c8f Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88 
Change-Id: I17b96ff3b0cb78823bea64d709e41e56c50fe16c
 2020-05-15 12:31:41 +00:00
Yanting Yang
360fdd8886 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f 
Change-Id: I8bdcb7e50dd65f57870eef048519624bdb49aad5
 2020-05-15 12:31:37 +00:00
Yanting Yang
fa064bf433 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 
Change-Id: Ie94785c96d827bd401c5cfc01e420770eed36f60
 2020-05-15 12:31:26 +00:00
Yanting Yang
2b8702ad88 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 
Change-Id: If84a87337bb5ecd5d8380111415188cc2a99cd54
 2020-05-15 12:14:06 +00:00
Yanting Yang
b30ae28c9f Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 
Change-Id: I22020bae8d96593a3944745b3bde5448c2638aef
 2020-05-15 12:13:56 +00:00
Yanting Yang
8a20f65064 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 
Change-Id: Ifd6e80cd31be4654f250d040c43b133157d5a865
 2020-05-15 12:13:32 +00:00
Treehugger Robot
8c1924d9c2 Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985 am: 7f1f96ac92 am: d0b06f5bee 
Change-Id: Ifaec6bdabbb5f55461804bd6ee1b5e714077c0ac
 2020-05-15 12:08:00 +00:00
Yanting Yang
8b3c7b20b5 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 
Change-Id: If322e9049dc828a406533694cd2062f4fe6456ac
 2020-05-15 12:01:28 +00:00
Yanting Yang
b9104da715 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 
Change-Id: I21ed82dc007d52cd0e4d157ca20d07198830fbdc
 2020-05-15 12:00:56 +00:00