Mehdi Alizadeh
a220a524fa
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev am: 3ac16896b9
...
am: 3e2897b6cd
2018-04-06 14:57:22 -07:00
Lei Yu
4afd56362a
Merge "Add test for anomaly detection in P" into pi-dev am: e0864a030f
...
am: 84b0cbc3ee
2018-04-06 14:51:06 -07:00
Mehdi Alizadeh
3e2897b6cd
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev
...
am: 3ac16896b9
2018-04-06 14:37:59 -07:00
Lei Yu
84b0cbc3ee
Merge "Add test for anomaly detection in P" into pi-dev
...
am: e0864a030f
2018-04-06 14:30:43 -07:00
Nicolas Geoffray
761c47628b
Merge "Exempt tests from hidden API checks." into pi-dev am: 8838b3fa9c
...
am: b3ef209fc6
2018-04-06 14:00:39 -07:00
arangelov
9993ea833a
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev am: 22a12c0ea2
...
am: a739a63880
2018-04-06 13:59:46 -07:00
Lei Yu
ebb18819b7
Merge "Add battery illustration" into pi-dev am: 3035d45a8f
...
am: 0c43bd4c36
2018-04-06 13:51:07 -07:00
Lei Yu
2678c6e34a
Merge "Add name and icon for AOD" into pi-dev am: f9cea645e1
...
am: 17c2906404
2018-04-06 13:48:32 -07:00
Mehdi Alizadeh
3ac16896b9
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev
2018-04-06 20:46:18 +00:00
TreeHugger Robot
e0864a030f
Merge "Add test for anomaly detection in P" into pi-dev
2018-04-06 20:46:00 +00:00
Mehdi Alizadeh
00a2b83bf9
Adds strings for Swipe Up gesture in Settings
...
Bug: 77549883
Test: None
Change-Id: I64b448f3a3564e8ac6d29e1241e84032708dba71
2018-04-06 20:43:43 +00:00
Nicolas Geoffray
b3ef209fc6
Merge "Exempt tests from hidden API checks." into pi-dev
...
am: 8838b3fa9c
2018-04-06 13:41:53 -07:00
arangelov
a739a63880
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev
...
am: 22a12c0ea2
2018-04-06 13:41:21 -07:00
TreeHugger Robot
8838b3fa9c
Merge "Exempt tests from hidden API checks." into pi-dev
2018-04-06 20:39:24 +00:00
Lei Yu
0c43bd4c36
Merge "Add battery illustration" into pi-dev
...
am: 3035d45a8f
2018-04-06 13:38:10 -07:00
TreeHugger Robot
22a12c0ea2
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev
2018-04-06 20:35:41 +00:00
Lei Yu
17c2906404
Merge "Add name and icon for AOD" into pi-dev
...
am: f9cea645e1
2018-04-06 13:35:31 -07:00
TreeHugger Robot
3035d45a8f
Merge "Add battery illustration" into pi-dev
2018-04-06 20:26:24 +00:00
TreeHugger Robot
f9cea645e1
Merge "Add name and icon for AOD" into pi-dev
2018-04-06 20:19:21 +00:00
Lei Yu
9783a7c2ac
Merge "Add anomaly log to dumpsys" into pi-dev am: 4becdc6fbe
...
am: 7556fc543c
2018-04-06 12:57:37 -07:00
Lei Yu
7556fc543c
Merge "Add anomaly log to dumpsys" into pi-dev
...
am: 4becdc6fbe
2018-04-06 12:37:26 -07:00
TreeHugger Robot
4becdc6fbe
Merge "Add anomaly log to dumpsys" into pi-dev
2018-04-06 19:28:55 +00:00
Lei Yu
978193dbe6
Merge "Hide app if it shares uid with whitelisted app" into pi-dev am: 78e2cad8b1
...
am: 0e2c488273
2018-04-06 11:08:05 -07:00
Fan Zhang
e1971f99b8
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev am: 14244ffb9d
...
am: 24267b2e93
2018-04-06 11:07:31 -07:00
Lei Yu
0e2c488273
Merge "Hide app if it shares uid with whitelisted app" into pi-dev
...
am: 78e2cad8b1
2018-04-06 10:52:39 -07:00
Fan Zhang
24267b2e93
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev
...
am: 14244ffb9d
2018-04-06 10:51:42 -07:00
Lei Yu
9553855af4
Add test for anomaly detection in P
...
Lot of tests have been added already, this CL adds the missing tests
after robolectric upgrade.
Also add UID_NULL check in AnomalyDetectionJobService. It is almost
impossible to happen however we better catch it.
Bug: 73172999
Test: RunSettingsRoboTests
Change-Id: I950537efb166b0900393df1321ca64151b43e906
2018-04-06 10:49:36 -07:00
Daniel Solomon
7f2ae90df2
Merge "Disable user control of color mode depending on Accessibility" into pi-dev am: c9bd31b2f8
...
am: c04f722cab
2018-04-06 10:48:49 -07:00
Daniel Solomon
c04f722cab
Merge "Disable user control of color mode depending on Accessibility" into pi-dev
...
am: c9bd31b2f8
2018-04-06 10:41:28 -07:00
Lei Yu
78e2cad8b1
Merge "Hide app if it shares uid with whitelisted app" into pi-dev
2018-04-06 17:19:19 +00:00
TreeHugger Robot
14244ffb9d
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev
2018-04-06 17:15:46 +00:00
TreeHugger Robot
c9bd31b2f8
Merge "Disable user control of color mode depending on Accessibility" into pi-dev
2018-04-06 17:12:01 +00:00
Tony Mak
71b078d636
Merge "apostrophe should be curly" into pi-dev am: 7a5e97e10f
...
am: 4ccd4cb98c
2018-04-06 09:51:18 -07:00
Tony Mak
4ccd4cb98c
Merge "apostrophe should be curly" into pi-dev
...
am: 7a5e97e10f
2018-04-06 09:44:43 -07:00
TreeHugger Robot
7a5e97e10f
Merge "apostrophe should be curly" into pi-dev
2018-04-06 16:32:35 +00:00
Nicolas Geoffray
932679b141
Exempt tests from hidden API checks.
...
Bug: 64382372
Bug: 74963051
Test: m
Change-Id: I4e51a8a7d86ac79668f66057daf550a8f04711dd
2018-04-06 14:55:46 +01:00
arangelov
cf1e59a960
Change "More details" to "Learn more" in policy transparency dialog.
...
Screenshot: https://screenshot.googleplex.com/5xrwW3g29qa.png
Bug: 77618738
Test: none
Change-Id: I464f492cd6b1468b85b5a691c29ae7a982ecebff
2018-04-06 14:31:32 +01:00
Andreas Terzis
e978d3dae0
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev am: c91339b3ce
...
am: 151f765339
2018-04-05 17:36:34 -07:00
ryanywlin
ee03999ad3
Merge "Add new string for sound settings" into pi-dev am: ac119ae807
...
am: 7eb22b055f
2018-04-05 17:34:27 -07:00
Andreas Terzis
151f765339
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
...
am: c91339b3ce
2018-04-05 17:16:19 -07:00
ryanywlin
7eb22b055f
Merge "Add new string for sound settings" into pi-dev
...
am: ac119ae807
2018-04-05 17:14:35 -07:00
TreeHugger Robot
c91339b3ce
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
2018-04-05 23:41:47 +00:00
Bill Yi
1e7039de9d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3da184f074 -s ours
...
am: 32cab7934a
2018-04-05 16:35:26 -07:00
TreeHugger Robot
ac119ae807
Merge "Add new string for sound settings" into pi-dev
2018-04-05 23:33:40 +00:00
Jan Nordqvist
087b5797ed
Merge "Change "X over" text color to ColorError" into pi-dev am: 22bf690fdd
...
am: b2a8860b3c
2018-04-05 16:31:40 -07:00
Bill Yi
32cab7934a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 3da184f074
2018-04-05 16:24:00 -07:00
TreeHugger Robot
3da184f074
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-05 23:12:21 +00:00
Jan Nordqvist
b2a8860b3c
Merge "Change "X over" text color to ColorError" into pi-dev
...
am: 22bf690fdd
2018-04-05 16:11:16 -07:00
Lei Yu
85bab3d4d9
Add name and icon for AOD
...
Keep it in both app list and full usage list for now,
so we don't need to update smearing code.
Bug: 77156569
Test: Screenshot | RunSettingsRoboTests
Change-Id: I5247da90ea591b226cafef8f2d1ffcbff387b62f
2018-04-05 16:01:03 -07:00
TreeHugger Robot
22bf690fdd
Merge "Change "X over" text color to ColorError" into pi-dev
2018-04-05 22:47:23 +00:00
