Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,342 Commits 1 Branch 0 Tags
a98ed95e38961145bdc17993e095d495bb8d6860
Commit Graph

32345 Commits

Author SHA1 Message Date
Automerger Merge Worker
693186aa5f Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3 
Change-Id: Id9c15e44517cb7752c9e8509e7ac4fa4845efde6
 2020-05-04 09:39:46 +00:00
Bonian Chen
da07873848 [Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c am: 81cf99b2c8 
Change-Id: I4add4e3cecf4bf593fd2337ada98e5070ee0660d
 2020-05-04 09:39:19 +00:00
tim peng
ef82018b68 Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03 
Change-Id: Ida6ddf7e5635e9e9f578837dea209edfbc8151d6
 2020-05-04 09:14:36 +00:00
Bonian Chen
be8eba0d3c [Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 
Change-Id: If14b3bcd1a908d9aa4f642cc0e2501140a244592
 2020-05-04 09:14:28 +00:00
tim peng
8e81088c03 Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 
Change-Id: I74eedc4056be20f794ad37962cc3ad2f7a1351fc
 2020-05-04 09:02:38 +00:00
Bonian Chen
0f35750434 [Settings] Crash avoidance am: 017cc4e48f 
Change-Id: Icc577b07a30bf31f5f745ebe4af2e526efb9ae6b
 2020-05-04 09:02:12 +00:00
tim peng
1424b594c9 Merge "Modify rule of remote media session UI" into rvc-dev 2020-05-04 08:47:41 +00:00
Bonian Chen
017cc4e48f [Settings] Crash avoidance 
Avoid crash when NullPointer.

Bug: 155248992
Test: manual
Change-Id: I5e4b46dcdf7ff21713b3f77fc9e20f503800b8e2
 2020-05-04 14:11:09 +08:00
Lucas Dupin
ef6db613e2 Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d am: f966f6449a 
Change-Id: If04212840be902047e00bea9cb83ae3e399d07bf
 2020-05-04 04:48:28 +00:00
Tim Peng
e9b91f08c4 Modify rule of remote media session UI 
-Add preference by remote session in Sound Setting
-Add slice item by remote session in Volume panel
-Replace media device data with media session data
-Add test case

Bug: 154918214
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1c873c9f99eebcba377f4115c4b9b4297b20c3d
 2020-05-04 12:21:20 +08:00
Lucas Dupin
d0e6d5421d Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d 
Change-Id: I9cd6189b7386b4e0174911219b4fd31f1b8a2686
 2020-05-04 04:18:17 +00:00
Lucas Dupin
c716801a8d Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 
Change-Id: I5d785681b2833ecbf6ae43234e5a09315a2a4232
 2020-05-04 04:07:54 +00:00
Lucas Dupin
7dc7252c15 Merge "Create QS media player setting" into rvc-dev 2020-05-04 03:59:28 +00:00
TreeHugger Robot
4863cfd64e Merge "Remove setWorkChallengeBackground" 2020-05-01 15:31:33 +00:00
Arc Wang
03a61b2d78 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b am: ff739eb2aa am: 9c76b20c3b 
Change-Id: I75eed0d018cb5ce9a02b9a381d09bcf378d16d6e
 2020-05-01 14:22:45 +00:00
Arc Wang
ff739eb2aa Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b 
Change-Id: I816467abc7caea295d29f3007c6bd5fd11c2d5d2
 2020-05-01 13:43:12 +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
362858810a Remove setWorkChallengeBackground 
* In Android R, the work challenge
  UI was updated to the latest material
  spec. The background and organization
  color are no longer used and can be
  removed.

Bug: 155464031
Test: Check Settings work challenge to
      ensure code removal does not break
      anything.
Change-Id: Ibc4dac2f47441751fde95485c223e61785f5aae8
 2020-05-01 12:57:12 +01:00
Alex Johnston
8f75ffe0be Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 50639850ef am: 01a52651be 
Change-Id: Id0635766cb9c903a3803f67768d6ca4e678d095f
 2020-05-01 11:10:11 +00:00
Alex Johnston
50639850ef Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d 
Change-Id: I21441661c6b925fe68a13b321a75cf3c6e42730d
 2020-05-01 10:45:09 +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
Arc Wang
4fb48d5d19 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 40eb2f6d21 am: 4ba2bfbc72 
Change-Id: Idc827915a526820fe25d3690d6036ac05c3c8a1c
 2020-05-01 05:49:41 +00:00
Arc Wang
40eb2f6d21 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f 
Change-Id: Id62927c762c18569f1936bd9deb5d32b5058fa2f
 2020-05-01 05:21:18 +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
Lucas Dupin
665c36eae2 Create QS media player setting 
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QuickSettingsMediaPlayerPreferenceControllerTest
Test: manual
Fixes: 155315021
Change-Id: I2583b985710898d0480f599fc9b5a2451c8950a7
 2020-04-30 12:04:23 -07:00
Edgar Wang
e1bb2e3a86 Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: 15e89819cb am: 29fea828bb am: 7bf033dc66 
Change-Id: Iec5ecb5856ee7e33e576066113688d45e309169f
 2020-04-30 15:19:00 +00:00
Edgar Wang
29fea828bb Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: 15e89819cb 
Change-Id: I7b687f44de73ea4e72ed9f708b8d134cc610fdd5
 2020-04-30 14:50:09 +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
15e89819cb Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 
Change-Id: I61e0f2152f3d7249c7ed4c833bd0da04f066a996
 2020-04-30 14:37: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
7656882a4e Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d am: b15a93f76e am: bfbf2a4c6a 
Change-Id: I7bfa18830ebf7b8216a755bdf59c85a4a0703d3e
 2020-04-30 14:18:36 +00:00
Yanting Yang
b15a93f76e Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d 
Change-Id: Ib47a3ae99217d7db51da3d8a0b52299ff9a093d0
 2020-04-30 13:50:25 +00:00
Yanting Yang
fb2ef59a3c Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 
Change-Id: Iffcf5b68b1efb84ee0467480f68ef1cdb5d196e7
 2020-04-30 13:37:42 +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
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
Automerger Merge Worker
561b431773 Merge "Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8 am: 7725372140" into rvc-d1-dev-plus-aosp am: a6a76a1eb3 am: 4b64e6755d 
Change-Id: Ibefbb689c4adf46af4ea88414b8ea14921cc77cf
 2020-04-30 13:09:20 +00:00
TreeHugger Robot
74633a27ab Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace am: b97b9a1906 am: a382556868 am: e63713e62b 
Change-Id: Id2ff912ba2e34be2de088ddeb26da52a8ad1e5e1
 2020-04-30 13:08:39 +00:00
TreeHugger Robot
3e6650f56e Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980 am: caf9a77274 am: 2e7c4dff34 am: 8fc33fe2f6 
Change-Id: I85bafaa537707622524eab3f3744145651db5271
 2020-04-30 13:07:45 +00:00
Jason Hsu
26b3f3b9cc Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8 am: 7725372140 
Change-Id: I68a485b26308f3ee10d066caaf3ddc4af1eb68c9
 2020-04-30 12:42:18 +00:00
TreeHugger Robot
a382556868 Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace am: b97b9a1906 
Change-Id: I3cd0d36311a66624ae16f26672081f48f4ecadcd
 2020-04-30 12:42:10 +00:00
TreeHugger Robot
2e7c4dff34 Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980 am: caf9a77274 
Change-Id: Ia2618778e6cd3f5e7bb62913a826a78c0038e3f0
 2020-04-30 12:41:58 +00:00
Jason Hsu
7725372140 Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8 
Change-Id: I4d1770975ed6dc6f66fe1fd1b07869c36e754e70
 2020-04-30 12:32:04 +00:00
Jason Hsu
2b137abdf0 Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8 
Change-Id: Ic565f4be6ac3c6499bde8e6b3f18fae5e70de79c
 2020-04-30 12:31:35 +00:00
TreeHugger Robot
b97b9a1906 Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace 
Change-Id: Ib6dc8fe0cc36ddce8249e00af7a57664853afdb3
 2020-04-30 12:31:26 +00:00