Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,930 Commits 1 Branch 0 Tags
d1d82ba5d7eb7a862e522f07bbd377eb3ddf50ea
Commit Graph

61930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
d1d82ba5d7 Snap for 6457311 from 297f9b73b8 to mainline-release 
Change-Id: Ifd7b143fee7141e10a14181669d6381bf53b0a1c
 2020-05-04 07:09:35 +00:00
TreeHugger Robot
297f9b73b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: b2ff994477 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8f75a012e0275c0823eb5e7de9a33bdf05d6e761
 2020-05-03 09:30:30 +00:00
TreeHugger Robot
b2ff994477 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4f235712e92d9d82c2ae8a57fb593149a4caf8a7
 2020-05-03 09:16:12 +00:00
TreeHugger Robot
1608a623b7 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-03 09:00:38 +00:00
TreeHugger Robot
4f72bfca53 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 2fe0bc5526 -s ours 
am skip reason: subject contains skip directive

Change-Id: I90ee005150e292ee976c437237645b70892dc649
 2020-05-03 08:49:28 +00:00
TreeHugger Robot
2fe0bc5526 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours 
am skip reason: subject contains skip directive

Change-Id: I85a96ced85f72bce27aebddc6ceebef012aaaf09
 2020-05-03 08:36:57 +00:00
TreeHugger Robot
9bd365150c Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-03 08:23:22 +00:00
android-build-team Robot
f278c7945c Snap for 6456462 from 325024f0db to mainline-release 
Change-Id: I6c096f471172cfbbabda423c2355226b6b7bfca9
 2020-05-03 07:07:24 +00:00
Bill Yi
ca4f8dfb98 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I4c63597e3993b679af42f096a8af9dc4dceea1c1
 2020-05-02 19:12:05 -07:00
Bill Yi
651cc12908 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Iadf2ead728407f20fa5fead25b15bafb811d7f20
 2020-05-02 18:40:13 -07:00
Bill Yi
325024f0db [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours am: e20bd14430 -s ours am: 169e568744 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2f5d0d66c89ff47a944534cd8260413deceb610d
 2020-05-02 06:16:48 +00:00
Bill Yi
169e568744 [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours am: e20bd14430 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9694e11c95ae5dd62e7b1f341617278dd1841d8d
 2020-05-02 06:05:48 +00:00
Bill Yi
e20bd14430 [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours 
am skip reason: subject contains skip directive

Change-Id: I1cd6c37cb420674e93b863d21a2b0062d7a355e4
 2020-05-02 05:50:15 +00:00
Bill Yi
37c795af3a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I76a7e3b5737e53869bee71cb8f8bbab9dbb40fc1
 2020-05-01 18:03:30 -07:00
TreeHugger Robot
dc66708f5e Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25 am: 79fca6d0bd am: 207909d2ba 
Change-Id: Ie01008a5514c04279d53b8c13a4815e7a25b1a6c
 2020-05-01 15:01:34 +00:00
TreeHugger Robot
207909d2ba Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25 am: 79fca6d0bd 
Change-Id: I63852fa775f4382dfbabfa6ee6ac8843cc3789be
 2020-05-01 14:48:50 +00:00
TreeHugger Robot
79fca6d0bd Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25 
Change-Id: I85c102e34db5c098eaff667b01848c7113416c2b
 2020-05-01 14:37:04 +00:00
TreeHugger Robot
d2f16b4a25 Merge "Center text even if string is long" into rvc-dev 2020-05-01 14:20:23 +00:00
Arc Wang
aa2693206b Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b am: 889c3e30a9 
Change-Id: Ib6a49b7cdc7b3ef16ee97a508d0dda128122e667
 2020-05-01 13:59:09 +00:00
Arc Wang
889c3e30a9 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b 
Change-Id: I7a991ccb0a24e3037542b25878a0dbe4ccf8835a
 2020-05-01 13:43:29 +00:00
Arc Wang
099685206b Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 
Change-Id: Id2e7b98fe3e461119ab9a8e4573361f800a53328
 2020-05-01 13:32:06 +00:00
Arc Wang
0a8c3b0420 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev 2020-05-01 13:16:08 +00:00
Alex Johnston
d9ff4c126c Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 3f0c3e900c 
Change-Id: I3b854c9af047721f0cae6cacbbcaac2fe4e3988f
 2020-05-01 10:57:51 +00:00
Alex Johnston
3f0c3e900c Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d 
Change-Id: I4fed17fb3a43035a8d4dd21a16262795a2fd9a9a
 2020-05-01 10:45:35 +00:00
Alex Johnston
d228e68e5d Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 
Change-Id: Id61362adab4df33881d0eb7d9675cbf46c2236c6
 2020-05-01 10:30:55 +00:00
Alex Johnston
cf342c9581 Merge "Update work challenge header in Settings" into rvc-dev 2020-05-01 10:10:49 +00:00
android-build-team Robot
51ef118843 Snap for 6450912 from abbbd8ca2f to mainline-release 
Change-Id: I69c277adbfa082c2fc3292423f827bf7e7144e2c
 2020-05-01 07:11:26 +00:00
Arc Wang
86f48566ae Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02 
Change-Id: Ie55f5540bf57fe8a16bd6b05fab697db7795aba2
 2020-05-01 05:37:36 +00:00
Arc Wang
3860223c02 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f 
Change-Id: I8e1e45e0e65ecb3537317ca7b3e93229d9eccdc6
 2020-05-01 05:21:36 +00:00
Arc Wang
9aff7f5d0f Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d 
Change-Id: Id77ca934c98b189bb2634b17e53ff580025fe2bd
 2020-05-01 05:06:19 +00:00
Arc Wang
7e40584e5d Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev 2020-05-01 04:52:30 +00:00
govenliu
4d74ae2e67 [Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases. 
Add new unit test cases in WifiP2pSettingsTest.java, the coverage rate will raise from 30% to 71%.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I214866efae47a99e75178beca48deb398b70f9bd
 2020-05-01 09:00:10 +08:00
Julia Reynolds
815ee670c9 Center text even if string is long 
Test: manual in Armenian language
Fixes: 154930071
Change-Id: I61a84958a2043d36241b6fa5eff8dcb2c7ef0db0
 2020-04-30 13:05:04 -04:00
TreeHugger Robot
abbbd8ca2f Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735 
Change-Id: I1318f9f1772843cfa1b4e3b27e55fc9b48d7e137
 2020-04-30 16:40:37 +00:00
TreeHugger Robot
944fac2735 Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d 
Change-Id: If0c9c0ca60ff02fdff41cd1fe8bc09f1409fa899
 2020-04-30 16:26:50 +00:00
TreeHugger Robot
631944fe1d Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 
Change-Id: I3d8a9c7bcb1963f40be9dfd651f52df8dc0032b6
 2020-04-30 16:07:39 +00:00
TreeHugger Robot
6debb6a775 Merge "Add keyword for app pinning setting" into rvc-dev 2020-04-30 15:49:19 +00:00
TreeHugger Robot
a2bf50fb82 Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05 
Change-Id: Id601ff3855dd1b75def0233ca908fc1f539e96dc
 2020-04-30 15:14:36 +00:00
Edgar Wang
97e849fbb2 Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea 
Change-Id: Icfefba456a0c18a400852b75c12c48011c6c6725
 2020-04-30 15:12:17 +00:00
TreeHugger Robot
5d31959c05 Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 
Change-Id: I43434b52458c37d8bb426221fa0a6bb96083c0d8
 2020-04-30 14:51:38 +00:00
Edgar Wang
680b374dea Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 
Change-Id: I3aeb2bf7f3c82193a98275f8e7171f9aebbf0a45
 2020-04-30 14:51:17 +00:00
TreeHugger Robot
6b77190291 Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 
Change-Id: I0edc70f57a615a544d3aafd0561a8cf928c3c44d
 2020-04-30 14:43:31 +00:00
Edgar Wang
db6bf67b32 Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 
Change-Id: I3241d5cd6a29013c29313059af555e8bd0ac8ee2
 2020-04-30 14:37:31 +00:00
TreeHugger Robot
4f244f6b88 Merge "Fix missing zone strings in some cases" into rvc-dev 2020-04-30 14:32:40 +00:00
Edgar Wang
cf654356d6 Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev 2020-04-30 14:27:23 +00:00
Yanting Yang
1997ecffa3 Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d am: 2b6b05a4e2 
Change-Id: I923d2e1a422705089436ad1e5b0dcc06f0ece68a
 2020-04-30 14:06:34 +00:00
Yanting Yang
2b6b05a4e2 Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d 
Change-Id: Ib76fc89d78adfcdd91d7d7e641a352941e317f61
 2020-04-30 13:50:38 +00:00
Yanting Yang
e3840fbc2d Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 
Change-Id: Ifd6305cadbc27da4e72c2ee94f1b7fe03e93f812
 2020-04-30 13:37:36 +00:00
Tsung-Mao Fang
d3b4b1043b Add keyword for app pinning setting 
We change the "screen pinning" to "app pinning",
and we still want to let user can get same search result
when they query "screen pinning".

Test: Open search and query "screen pinning", see the app pinning result
Bug: 151332926
Change-Id: Ice49d6db39ce89aa84508587262d9529df726784
 2020-04-30 21:24:53 +08:00
Yanting Yang
459e5e1636 Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev 2020-04-30 13:17:01 +00:00