Commit Graph

34768 Commits

Author SHA1 Message Date
Lei Yu
cce44a57bf Merge "Add log for BatteryUtils" into oc-dev am: 27dc9b69ac
am: 964de0d7be

Change-Id: I11d8232ca7b1d96625cec881d085269fb81e8322
2017-04-10 17:17:52 +00:00
Lei Yu
964de0d7be Merge "Add log for BatteryUtils" into oc-dev
am: 27dc9b69ac

Change-Id: I5bad76814ac4b6346c634498e0a5952f5d539f17
2017-04-10 17:13:22 +00:00
Lei Yu
27dc9b69ac Merge "Add log for BatteryUtils" into oc-dev 2017-04-10 17:06:45 +00:00
Bill Yi
4672147bdf Merge "Import translations. DO NOT MERGE" into oc-dev am: 4c4f2a7c4c -s ours
am: dc41538fcc  -s ours

Change-Id: If667e6caee86a65849a2b57c7d5d979987304c6a
2017-04-08 08:27:35 +00:00
Bill Yi
dc41538fcc Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4c4f2a7c4c  -s ours

Change-Id: Ibcdcd69068104c8db306d0b5d02276fd351064e6
2017-04-08 08:19:51 +00:00
TreeHugger Robot
99475b4c24 Merge "Import translations. DO NOT MERGE" 2017-04-08 08:19:01 +00:00
TreeHugger Robot
4c4f2a7c4c Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 08:06:37 +00:00
Lei Yu
e57622d5a4 Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
am: 451964a124

Change-Id: I1aa65f1f4a9ec03ba61bfd981ec5386c5d38f631
2017-04-07 21:11:53 +00:00
Kevin Chyn
3b1caebf30 Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev am: 78dce02079
am: e359c21f71

Change-Id: I0fe1e293124db87f786b4da93c59586eac75fa4d
2017-04-07 21:09:04 +00:00
Lei Yu
451964a124 Merge "Extend the translation limit to 60" into oc-dev
am: 2a3a92b513

Change-Id: Iba43130a4d300ad62e775d6167aa888b4de9a437
2017-04-07 21:08:11 +00:00
Lei Yu
2a3a92b513 Merge "Extend the translation limit to 60" into oc-dev 2017-04-07 21:03:16 +00:00
Kevin Chyn
e359c21f71 Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am: 78dce02079

Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c
2017-04-07 21:01:09 +00:00
TreeHugger Robot
78dce02079 Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev 2017-04-07 20:55:15 +00:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
Doris Ling
f8dead2f40 Merge "Add summary text to Lock screen preferences." into oc-dev
am: a258e424a2

Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
2017-04-07 20:07:55 +00:00
Andrew Sapperstein
11400c5e81 Merge "Increase char limit for adaptive brightness text." into oc-dev am: a9acbd924a
am: e6db78a2f1

Change-Id: I6123d1c36204bc87276d4170850a1c7d318c7eea
2017-04-07 20:06:36 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Andrew Sapperstein
e6db78a2f1 Merge "Increase char limit for adaptive brightness text." into oc-dev
am: a9acbd924a

Change-Id: Ie7dea50e40606b39d29247740f7fb659738684a3
2017-04-07 20:02:37 +00:00
TreeHugger Robot
a9acbd924a Merge "Increase char limit for adaptive brightness text." into oc-dev 2017-04-07 19:55:54 +00:00
Daniel Nishi
27d8d2b46e Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
am: af587b0cfc

Change-Id: Icec5b8d5118497a7e4af21cc1c262400695b75e1
2017-04-07 19:50:05 +00:00
Daniel Nishi
af587b0cfc Merge "Update the automatic storage management preferences." into oc-dev
am: 7badf46542

Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
2017-04-07 19:46:05 +00:00
Daniel Nishi
7badf46542 Merge "Update the automatic storage management preferences." into oc-dev 2017-04-07 19:38:27 +00:00
Daniel Nishi
a480952e3d Merge "Fake the cache size to be 0 bytes when cleared." 2017-04-07 19:34:58 +00:00
TreeHugger Robot
0226581110 Merge "Fix encryption interstitial string" 2017-04-07 19:17:48 +00:00
Kevin Chyn
474178d094 renaming/removing fingerprints should be reflected in UI immediately
Fixes 30252265
Test: manual

Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
2017-04-07 11:52:00 -07:00
jackqdyulei
5d2918a675 Add log for BatteryUtils
This cl add logs to get more data for app usage time.

Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.

Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
2017-04-07 11:18:39 -07:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Lei Yu
e0e4c5d3eb Merge "Remove misc data in battery main page." into oc-dev am: abde170529
am: 52e096284f

Change-Id: I7f1665ea0864ff726a2964952c43fbb69d95e6f1
2017-04-07 18:03:21 +00:00
Lei Yu
52e096284f Merge "Remove misc data in battery main page." into oc-dev
am: abde170529

Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f
2017-04-07 17:51:50 +00:00
Lei Yu
abde170529 Merge "Remove misc data in battery main page." into oc-dev 2017-04-07 17:37:18 +00:00
Maurice Lam
d034f261af Fix encryption interstitial string
Test: Manual
Bug: 36801908
Change-Id: Ib5a06cc557458a451a6aec645e8331e75850cb2e
2017-04-07 10:35:39 -07:00
jackqdyulei
145cb81c21 Extend the translation limit to 60
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Andrew Sapperstein
12bdb22400 Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Bill Yi
2de5bb8291 Import translations. DO NOT MERGE
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
2017-04-07 09:27:04 -07:00
Bill Yi
4f1d3edfe6 Import translations. DO NOT MERGE
Change-Id: Iaa73edb3d34b6be32ce3d4e905883ea8dbd167cd
Auto-generated-cl: translation import
2017-04-07 09:10:36 -07:00
Filip Pavlis
5a2590dfdb Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: f023f50787
am: 7ae53e7df7

Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de
2017-04-07 10:45:07 +00:00
Filip Pavlis
7ae53e7df7 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am: f023f50787

Change-Id: I5209009c77680828d57b2178e3209b20c37f029d
2017-04-07 10:38:54 +00:00
Filip Pavlis
f023f50787 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 2017-04-07 10:31:45 +00:00
Phil Weaver
19ebace6c4 Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am: 0b9cd1b40e
am: ba98033945

Change-Id: I81533c721182e0e118bc2ed6eea7800c62b5be69
2017-04-07 05:55:19 +00:00
Phil Weaver
ba98033945 Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
am: 0b9cd1b40e

Change-Id: Ie4987e836593709c52a7afbedf826501180e1299
2017-04-07 05:50:42 +00:00
TreeHugger Robot
0b9cd1b40e Merge "Don't enable a11y service if scary dialog obscured" into oc-dev 2017-04-07 05:47:33 +00:00
Jim Miller
fc275db6f6 Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am: b8aaaf82a2
am: 9e6345e1b9

Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5
2017-04-07 04:55:39 +00:00
Jim Miller
9e6345e1b9 Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
am: b8aaaf82a2

Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
2017-04-07 04:51:09 +00:00
TreeHugger Robot
b8aaaf82a2 Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev 2017-04-07 04:47:59 +00:00
TreeHugger Robot
d4bfa472a8 Merge "Import translations. DO NOT MERGE" 2017-04-07 03:56:26 +00:00
Doris Ling
17d103e9d3 Merge "Add summary text for Encryption & credential." into oc-dev am: 65682e7fa5
am: 64c8244524

Change-Id: I5eec7aab71e3990d6f132a6f807f006a918f4c78
2017-04-07 02:55:03 +00:00
Doris Ling
64c8244524 Merge "Add summary text for Encryption & credential." into oc-dev
am: 65682e7fa5

Change-Id: I47fa8dffba03f8666972843046537dcbededef9c
2017-04-07 02:47:53 +00:00
TreeHugger Robot
65682e7fa5 Merge "Add summary text for Encryption & credential." into oc-dev 2017-04-07 02:40:13 +00:00
Doris Ling
d49dfb1472 Merge "Add test to verify no crash on selecting brightness level." into oc-dev am: 43146c4972
am: 272d65c0bc

Change-Id: I5dc16b17576273d7b3e43bae69e8bc60f29ccd5d
2017-04-07 02:37:13 +00:00
Doris Ling
0c39be8889 Merge "Update USb preference controller to use the new summary texts." into oc-dev am: e94ba3b55f
am: 8f3be96ba8

Change-Id: I6b8a83881fae1fea4cd1776fa28b354cae67dae9
2017-04-07 02:36:58 +00:00