Commit Graph

59805 Commits

Author SHA1 Message Date
Automerger Merge Worker
0fbe648878 Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017
Change-Id: I1a5185fb2c7eae81cd98ccbe713a333e09431d64
2020-03-16 22:21:51 +00:00
Treehugger Robot
177ce8f017 Merge "Fix mismatching intent filter string in AndroidManifest.xml" 2020-03-16 22:07:18 +00:00
joshmccloskey
593b5671c8 Require attention pref not searchable by default
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
2020-03-16 22:03:28 +00:00
Grace Jia
16092ab56f Fix mismatching intent filter string in AndroidManifest.xml
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
2020-03-16 13:27:25 -07:00
Kweku Adams
a7e58d7732 Change to public POWER_SAVE_MODE_CHANGED broadcast.
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.

Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
022790b197 Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
Change-Id: Ic74ab9f03b43fd1eebcb6fc32556f37b31c20943
2020-03-16 19:08:28 +00:00
TreeHugger Robot
b2c35f7fcc Merge "Do not finish early if caller is SUW" into rvc-dev 2020-03-16 18:56:54 +00:00
Automerger Merge Worker
7486f6a010 Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
Change-Id: I592406722b54ca059e4159826edff6d453802db2
2020-03-16 18:25:34 +00:00
Automerger Merge Worker
c4e391ad7c [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8de471415f4dd47fe4da433648cda9c173848b9
2020-03-16 18:25:25 +00:00
TreeHugger Robot
6c9cad2caf Merge "Update NLS/NAS warning text" into rvc-dev 2020-03-16 18:10:09 +00:00
Automerger Merge Worker
0a9e463fff [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
2020-03-16 18:09:37 +00:00
Kevin Chyn
e6bcc49eb9 Do not finish early if caller is SUW
Fixes: 151576034


Test: Wipe device, go past fingerprint enrollment in SUW, press
      back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
2020-03-16 09:32:41 -07:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
Automerger Merge Worker
a692d719cb Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
Change-Id: If953928e35be8b0a93b6438c32084238bd9b6859
2020-03-16 13:48:06 +00:00
TreeHugger Robot
b94605c378 Merge "Update strings for Screen Attention suggestion." into rvc-dev 2020-03-16 13:46:14 +00:00
Automerger Merge Worker
b32674e24f Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
Change-Id: Ibd5b7c7dfc2435253f969ba9f497e7a9dc1924f9
2020-03-16 13:39:19 +00:00
Julia Reynolds
68fad762ff Update NLS/NAS warning text
Test: manual
Fixes: 145129456
Change-Id: Ie3e7ecb432445c596d888614ae71cff27873ac6b
2020-03-16 09:30:10 -04:00
tim peng
b669fff40c Merge "Handle ransferring state in output switcher" into rvc-dev 2020-03-16 13:17:03 +00:00
Automerger Merge Worker
c9e4a2934f Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
Change-Id: I334933880d8a192e7d031cfa039c406a56a753c0
2020-03-16 12:21:28 +00:00
TreeHugger Robot
6d6e0f45b2 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev 2020-03-16 12:05:02 +00:00
Yi-Ling Chuang
f288a4ec53 Update strings for Screen Attention suggestion.
Bug: 144865404
Test: rebuild
Change-Id: Id5ab9a68a5f83c6fdc6451b96d8e7bfd831891d1
2020-03-16 17:54:39 +08:00
Automerger Merge Worker
9c6921cfb7 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08
Change-Id: I31a8f50caf0c783d659eb9fbbe49261bdd5590fe
2020-03-16 09:46:47 +00:00
Alex Johnston
8d430de5d5 Fix AppButtonPreferenceControllerTest
* isSystem was not being mocked.
* The tests where isSystem should return true
  were not being tested properly.

Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
2020-03-16 09:37:10 +00:00
zoey chen
2fad549b08 [Settings] Fix MobileNetworkActivity test case
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest
Bug: 144664534
Change-Id: Ifc63646f709b29c3a8947430bcec6a82fae02ea5
2020-03-16 14:51:16 +08:00
Automerger Merge Worker
fa49765db7 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79
Change-Id: Ic83b788655896ccc5f2f7a4694ecb8adf1f0b1d6
2020-03-16 05:12:16 +00:00
tim peng
3a18ee5c79 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev 2020-03-16 04:56:01 +00:00
Automerger Merge Worker
026ed69b8c Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874
Change-Id: I679887c29602a2e445e22c1e0e7ce455605c2eed
2020-03-16 04:06:36 +00:00
Mehdi Alizadeh
42a906d874 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev 2020-03-16 04:01:11 +00:00
Automerger Merge Worker
1f835adb07 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a
Change-Id: I740e247daadfbfeb5ba763b6aa9ad783b6b81d4b
2020-03-16 01:52:09 +00:00
Edgar Wang
ed39b5bb1a Merge "Remove duplicated index search data" into rvc-dev 2020-03-16 01:42:22 +00:00
Automerger Merge Worker
e080bd7985 Merge "Blur developer setting" into rvc-dev am: 59b3974433
Change-Id: Ibcb04fdd68889f304f67e02261c8484dff3afac5
2020-03-15 23:40:18 +00:00
Lucas Dupin
59b3974433 Merge "Blur developer setting" into rvc-dev 2020-03-15 23:28:13 +00:00
Automerger Merge Worker
c7bd3a2336 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
2020-03-13 23:42:29 +00:00
Automerger Merge Worker
008480e019 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3
Change-Id: I3aaa084901d593f3330469a499f548b6e40b42db
2020-03-13 23:23:30 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +00:00
Automerger Merge Worker
e3aaaa8a59 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
Change-Id: I84f4e0575e252520704d6afec262ecb6de9f0916
2020-03-13 16:52:18 +00:00
TreeHugger Robot
907905bb96 Merge "Refine remove locale warning dialog string" into rvc-dev 2020-03-13 16:43:45 +00:00
Automerger Merge Worker
5b859bf70c Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4
Change-Id: If38fe59db1f1ea7ad013a9a3d8c3991ceae689bc
2020-03-13 16:34:31 +00:00
Brad Ebinger
117995aec4 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev 2020-03-13 16:23:10 +00:00
Automerger Merge Worker
91002efcd6 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
Change-Id: I19c97f204b39f0097b32f433937fa40e555f03d5
2020-03-13 14:47:29 +00:00
Alex Johnston
37fa5bd059 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev 2020-03-13 14:28:15 +00:00
Automerger Merge Worker
43d0d904c9 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12
Change-Id: I4ed00fb35eb82352a0609fd089d4fbb06ed01ef0
2020-03-13 13:57:02 +00:00
Automerger Merge Worker
0c0a52cc12 Merge "Settings performance testing" am: 4186be0f29
Change-Id: Iaf5b3e75f376bc7dc2e875f1e10adecedc34231a
2020-03-13 13:35:25 +00:00
Raff Tsai
4186be0f29 Merge "Settings performance testing" 2020-03-13 13:22:57 +00:00
youtengliang
ef861b0e3e Settings performance testing
Test: atest com.android.settings.tests.perf LaunchSettingsTest

Change-Id: I32a077b22bc4cd36c7aab32dd22dede87b406641
2020-03-13 13:22:38 +00:00
menghanli
9785c7e290 Update R accessibility assets and strings (4/n)
- Color inversion preview
- Caption manager preview
- Dwell preview

Bug: 148837311
Test: Manual test
Change-Id: Ia637074c4282bbc51befc44efb0a4ff474f86b26
2020-03-13 12:43:36 +00:00
Automerger Merge Worker
a100aa0b4a Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144
Change-Id: Iee70153f85680bcfa442ca4fb75fe5cbacd33a7c
2020-03-13 12:25:02 +00:00
Automerger Merge Worker
9777ca7dd9 [automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9 is in history

Change-Id: I0492e148b8159abdbfa046667ded907980880877
2020-03-13 12:24:55 +00:00
Automerger Merge Worker
7bb5275105 Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
Change-Id: I9ff971f6bdfea2528074064e68997028f55edd7a
2020-03-13 12:24:48 +00:00
Automerger Merge Worker
68725db15f Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
Change-Id: Ic5401b124d3b3e637d5c057477204cd84dde6884
2020-03-13 12:24:38 +00:00