Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
2017-04-10 23:11:42 +00:00
Honglu Yin
4604741c51
Merge "Title is different after tapping "Memory used by apps""
...
am: 7d9146e10a
Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
2017-04-10 23:04:57 +00:00
Jack He
9e1e430f06
Merge "Add developer menu entry to enable Bluetooth inband ringing"
...
am: 3d08bedba2
Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
2017-04-10 23:00:11 +00:00
Treehugger Robot
7d9146e10a
Merge "Title is different after tapping "Memory used by apps""
2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2
Merge "Add developer menu entry to enable Bluetooth inband ringing"
2017-04-10 22:47:55 +00:00
Doris Ling
ca95a90c11
Update text for security preference.
...
Swap location to screen lock in title and summary.
Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
2017-04-10 15:21:18 -07:00
Hyunyoung Song
ebc17237c3
Add shadow to AdaptiveIconDrawables using View level shadow
...
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:
Bug: 36088922
Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Matthew Fritze
a0d03178d0
Reindex on OTA and locale change
...
When the user gets an OTA or changes language, settings
will clear the database and reindex it.
Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Garfield Tan
cea8a43a92
Merge "Fix the intent to launch storage details." into oc-dev
...
am: 66871d8531
Change-Id: I6b082e06a434a9d1ea098458e665c19a4975fb84
2017-04-10 20:41:47 +00:00
Evan Laird
044001f991
Add "Current screen saver" string
...
This one was missed originally.
Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
2017-04-10 16:35:45 -04:00
Garfield Tan
66871d8531
Merge "Fix the intent to launch storage details." into oc-dev
2017-04-10 20:24:20 +00:00
Chad Brubaker
68baa35adb
Send ACTION_KEYCHAIN_CHANGED when installing a cert
...
Change-Id: I846162511b5d75d937d4c543d47d535894e1d688
Fixes: 36492950
Test: Verified that installing a cert via UI triggers the broadcast
2017-04-10 10:33:52 -07:00
Daniel Nishi
f4af2774ee
Merge "Add user icon to the other user preferences." into oc-dev
...
am: b1c336de5f
Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b
2017-04-10 17:32:27 +00:00
Daniel Nishi
b1c336de5f
Merge "Add user icon to the other user preferences." into oc-dev
2017-04-10 17:27:25 +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
Julia Reynolds
7be0dbd86c
Sort channels and groups by id
...
Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
2017-04-10 12:47:13 -04: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
4c4f2a7c4c
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-08 08:06:37 +00:00
Garfield Tan
973cddcb1b
Fix the intent to launch storage details.
...
Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
2017-04-07 19:08:29 -07:00
Daniel Nishi
fe33c58a18
Add user icon to the other user preferences.
...
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.
Fixes: 36252572
Test: Robotest
Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
2017-04-07 14:57:07 -07: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
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
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
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
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
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
jackqdyulei
145cb81c21
Extend the translation limit to 60
...
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Paul Stewart
9b26496d03
Allow user to specify EAP-SIM under PEAP
...
Allow the user to select EAP-SIM methods as a second phase after
an outer PEAP authentication. This hides the "identity" and
"password" fields if one of these methods is selected.
Bug: 34835771
Test: Manual: Connect to PEAP/EAP-SIM AP
Change-Id: I7e448fbebd352a4b0facbfafa74afaff6b704386
2017-04-07 10:28:49 -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
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
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
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
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
272d65c0bc
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
...
am: 43146c4972
Change-Id: I4ae3d7fcd5680af78dd2538399368ad34ecef319
2017-04-07 02:33:17 +00:00
Doris Ling
8f3be96ba8
Merge "Update USb preference controller to use the new summary texts." into oc-dev
...
am: e94ba3b55f
Change-Id: I19479c26fd00d7e356ff109a089c6605261af870
2017-04-07 02:33:01 +00:00