Doris Ling
cc0ff8b164
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba am: 12a0952d49
...
am: 7da62c35a7
2016-08-24 16:15:53 +00:00
Doris Ling
7044490cfe
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
...
am: 6dcd71756d
2016-08-24 16:15:51 +00:00
Andrew Sapperstein
f36eac3889
resolve merge conflicts of 6890d53 to master
...
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
2016-08-24 10:50:28 -04:00
Pat Tjin
28fcccd185
Merge "Remove duplicate KEY_DEVICE_MODEL string set"
2016-08-24 04:48:08 +00:00
Maurice Lam
7da62c35a7
Remove duplicate string for fingerprint enroll am: 64ac93ba40
...
am: e0c8fcf453
2016-08-24 02:09:26 +00:00
Doris Ling
6dcd71756d
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba
...
am: 12a0952d49
2016-08-24 02:09:25 +00:00
Doris Ling
6890d538ae
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
...
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
2016-08-23 19:02:31 -07:00
TreeHugger Robot
98d840576e
Merge "Refactored Screenshot preference to be dependent on context preference."
2016-08-24 01:37:57 +00:00
Matthew Fritze
90d59f2332
Refactored Screenshot preference to be dependent on context preference.
...
Tests: Manual.
Change-Id: I2fde1a67ade4bf89bf38b4eae0ca98074cca868c
Fixes: 30681087
2016-08-23 23:32:46 +00:00
Maurice Lam
e0c8fcf453
Remove duplicate string for fingerprint enroll
...
am: 64ac93ba40
2016-08-23 22:23:00 +00:00
Doris Ling
12a0952d49
Merge "Log settings suggestions events only once." into nyc-mr1-dev
...
am: c4e5acedba
2016-08-23 22:18:00 +00:00
Doris Ling
f757d1ede8
Log settings suggestions events only once.
...
am: bfbb964cb1
2016-08-23 22:18:00 +00:00
Doris Ling
e08dcee5df
Add scrollbar to Settings app. am: 124251d54e am: 13a4eeb2a9
...
am: 9ca6758e0b
2016-08-23 22:16:40 +00:00
Doris Ling
c4e5acedba
Merge "Log settings suggestions events only once." into nyc-mr1-dev
2016-08-23 22:15:52 +00:00
Doris Ling
9ca6758e0b
Add scrollbar to Settings app. am: 124251d54e
...
am: 13a4eeb2a9
2016-08-23 21:46:42 +00:00
Doris Ling
13a4eeb2a9
Add scrollbar to Settings app.
...
am: 124251d54e
2016-08-23 21:43:33 +00:00
Rubin Xu
2b9b42f940
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am: 0948ce0cdb am: f9665da994
...
am: 0085774488
2016-08-23 21:42:51 +00:00
Rubin Xu
2358bf3330
Remove duplicated call to authenticationSucceeded() am: 3a437490be am: 886af76fb3
...
am: 7c23b6b04a
2016-08-23 21:42:49 +00:00
Rubin Xu
a305ec18fb
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am: 7a4ecbac12 am: bd7e2376fc
...
am: a2da83d30a
2016-08-23 21:42:46 +00:00
Rubin Xu
3c0e2cb4bf
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am: da9f9a0fab am: 7425b2d677
...
am: a63a05362f
2016-08-23 21:42:31 +00:00
Doris Ling
26ea60f188
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am: 6cdd5fccd8 am: 7849b2044c
...
am: fa896fbf9a
2016-08-23 21:41:35 +00:00
Doris Ling
7764047d7a
Fix crash when selecting AppInfo for uninstalled app from Recents. am: 7574b64910 am: 0f7d5f36a3
...
am: 753f95d7e0
2016-08-23 21:41:34 +00:00
Doris Ling
2859d0918b
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am: e9af5024a1 am: 7c529e5ba8
...
am: b29f18c49f
2016-08-23 21:41:33 +00:00
Doris Ling
61365a3155
Update Jump to Camera gesture settings description text. am: 8d9b89ed5c am: b9ed707735
...
am: 340d8b6268
2016-08-23 21:41:32 +00:00
Doris Ling
64b680ce4b
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am: cf988e3d64 am: f1c69ead73
...
am: 317af15dec
2016-08-23 21:41:31 +00:00
Doris Ling
cfdb2cb3c3
Fix caption text being cut off when text size is set to very large. am: 0f625ae280 am: 3768e718c6
...
am: 6e5ea7dbb9
2016-08-23 21:40:46 +00:00
Doris Ling
99bc2d51d2
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10 am: ea445c9db7
...
am: f101f3c396
2016-08-23 21:40:45 +00:00
Doris Ling
7e62e12fe0
Fix margin in Tap & pay -> Payment default. am: 9e29ac7983 am: 88842736d7
...
am: a44f2e0f8f
2016-08-23 21:40:44 +00:00
Matthew Fritze
a650d68fce
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am: 88d3cb7176 am: c9be13f26e
...
am: b4522799ef
2016-08-23 21:40:44 +00:00
Matthew Fritze
0afdd0c0f1
Stop apps with Storage Managers from launching activity when disabled am: 1051fe1e14 am: 7444ee791c
...
am: bf61bf6459
2016-08-23 21:40:43 +00:00
Salvador Martinez
e970cf5659
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b am: b3b0fd931b
...
am: bc81965891
2016-08-23 21:39:53 +00:00
Salvador Martinez
2c4593492f
Disabled BSM mode switch when plugged in am: d4a6768880 am: 18d58269a8
...
am: 3f3ce9595b
2016-08-23 21:39:51 +00:00
Salvador Martinez
102e21ea94
Merge "Made dialog material design compliant" into nyc-mr1-dev am: 4f6755931e am: a60628517f
...
am: fd59fa60e9
2016-08-23 21:39:49 +00:00
Salvador Martinez
4f63c1a99f
Made dialog material design compliant am: cfee94d448 am: 676db52b64
...
am: 1e9b8e67ff
2016-08-23 21:39:46 +00:00
Salvador Martinez
dbf24b526d
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am: 0e98c73666 am: 5817342f14
...
am: 597d352cfb
2016-08-23 21:39:43 +00:00
Salvador Martinez
1d2e0ba2f8
Merge "resolve merge conflicts of 052975e to master"
2016-08-23 21:30:13 +00:00
TreeHugger Robot
bc6ed505d7
Merge "Extract and refactor logic to determine the data usage summary mark."
2016-08-23 21:24:42 +00:00
Salvador Martinez
22d1849e6a
resolve merge conflicts of 052975e to master
...
Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd
2016-08-23 14:00:59 -07:00
Maurice Lam
64ac93ba40
Remove duplicate string for fingerprint enroll
...
Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit 56093f6f4f
2016-08-23 20:57:28 +00:00
Doris Ling
bfbb964cb1
Log settings suggestions events only once.
...
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes: 30108142
2016-08-23 13:25:06 -07:00
Salvador Martinez
141c20c5e3
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724 am: d31d90eecf
...
am: 2279920944
2016-08-23 20:06:53 +00:00
Salvador Martinez
803e69f62b
Prevent wifi icon from disappearing am: 5c0063af7e am: 56ebf2a051
...
am: 5bbfa0555a
2016-08-23 20:06:49 +00:00
Matthew Fritze
b42136ec8c
Extract and refactor logic to determine the data usage summary mark.
...
Created a new controller for DataUsageInfo and add appropriate
unit tests.
Bug: 30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: Robolectric tests with target RunSettingsRoboTests
2016-08-23 12:15:16 -07:00
TreeHugger Robot
ade95eb9b6
Merge "Force phone number display to be LTR in support tab."
2016-08-23 18:37:46 +00:00
Rubin Xu
0085774488
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am: 0948ce0cdb
...
am: f9665da994
2016-08-23 18:31:19 +00:00
Rubin Xu
7c23b6b04a
Remove duplicated call to authenticationSucceeded() am: 3a437490be
...
am: 886af76fb3
2016-08-23 18:31:16 +00:00
Rubin Xu
a2da83d30a
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am: 7a4ecbac12
...
am: bd7e2376fc
2016-08-23 18:30:14 +00:00
Rubin Xu
a63a05362f
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am: da9f9a0fab
...
am: 7425b2d677
2016-08-23 18:30:10 +00:00
Doris Ling
fa896fbf9a
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am: 6cdd5fccd8
...
am: 7849b2044c
2016-08-23 18:30:09 +00:00
Doris Ling
753f95d7e0
Fix crash when selecting AppInfo for uninstalled app from Recents. am: 7574b64910
...
am: 0f7d5f36a3
2016-08-23 18:30:08 +00:00
