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
Doris Ling
77ba0620ea
Fix animation video render issue when Settings->Moves is resumed from screen off. am: 008ba4ec40
...
am: 12967ed1a8
2016-08-24 04:11:42 +00:00
Doris Ling
12967ed1a8
Fix animation video render issue when Settings->Moves is resumed from screen off.
...
am: 008ba4ec40
2016-08-24 04:08:55 +00:00
Doris Ling
b88068a876
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
2016-08-24 04:05:39 +00:00
Fan Zhang
6c5c9ba8cb
Use isOemUnlockEnabled to drive oem unlocking toggle. am: 83f91f61ae
...
am: 2fd3f18e27
2016-08-24 02:33:38 +00:00
Svetoslav Ganov
e9f958f2b6
Only sync adapters with access can see an account - settings am: 6f9bf1da90
...
am: a2c7515a3f
2016-08-24 02:10:20 +00:00
Yoshinori Hirano
ce6a2356ad
Show summary of "Add user" item am: 2ce843b00e
...
am: 9224414477
2016-08-24 02:10:16 +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
Fan Zhang
2fd3f18e27
Use isOemUnlockEnabled to drive oem unlocking toggle.
...
am: 83f91f61ae
2016-08-24 00:36:10 +00:00
TreeHugger Robot
2c8178db3a
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
2016-08-24 00:31:54 +00:00
Svetoslav Ganov
a2c7515a3f
Only sync adapters with access can see an account - settings
...
am: 6f9bf1da90
2016-08-23 23:35:21 +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
TreeHugger Robot
de090f3f85
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
2016-08-23 23:26:48 +00:00
Yoshinori Hirano
9224414477
Show summary of "Add user" item
...
am: 2ce843b00e
2016-08-23 23:25:05 +00:00
Sudheer Shanka
acd34a9c72
Merge "Show summary of "Add user" item" into nyc-mr1-dev
2016-08-23 23:23:08 +00:00
Doris Ling
008ba4ec40
Fix animation video render issue when Settings->Moves is resumed from
...
screen off.
Re-initialize the animation video if necessary when the preference is
visible to the user.
Fixes: 31023261
Test: manual -
1. Go to Settings -> Moves and verify that the animation video are
displayed correctly on load.
2. Press power button to turn screen off, then on again. Verify when
Moves settings resumes, the animation video is displayed correctly.
3. Repeat #2 above but let display time out instead of turning off
screen by power button.
Change-Id: I0ee21d23a4c402b3a8463dca3b36fce67d651993
2016-08-23 16:08:34 -07:00
Doris Ling
f757d1ede8
Log settings suggestions events only once.
...
am: bfbb964cb1
2016-08-23 22:18:00 +00:00
Fan Zhang
83f91f61ae
Use isOemUnlockEnabled to drive oem unlocking toggle.
...
Bug: 31031467
Test: manually turned on/off persistent_data_block
Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f
2016-08-23 15:14:19 -07:00
Svetoslav Ganov
6f9bf1da90
Only sync adapters with access can see an account - settings
...
This change ensures that when the user tries to toggle a sync for a
sync adapter that doesn't have access to an account we show UI for
the user to approve the sync.
bug:28163381
Change-Id: I59802df6614572cf0eaf4b72a177beb111b87b34
2016-08-23 21:44:47 +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
Fan Zhang
ea024155fb
Add lifecycle observers for future mixin structures.
...
- Converted VisibilityLoggerMixin into a LifecyclerObservable so we
don't have to call logger.onResume/onPause manually in most fragments.
- Observable will be useful when we provide logics across all
fragment/activity, eg log lifecycle event latencies.
- Also added new tests for lifecycle component.
Bug: 30681529
Test: RunSettingsRoboTests
Change-Id: Ida39300aeb42f71b2e0bbfaebd0c51dc468cb5e8
2016-08-23 14:02:39 -07: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
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
Rubin Xu
7c23b6b04a
Remove duplicated call to authenticationSucceeded() am: 3a437490be
...
am: 886af76fb3
2016-08-23 18:31:16 +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
753f95d7e0
Fix crash when selecting AppInfo for uninstalled app from Recents. am: 7574b64910
...
am: 0f7d5f36a3
2016-08-23 18:30:08 +00:00
Matthew Fritze
bf61bf6459
Stop apps with Storage Managers from launching activity when disabled am: 1051fe1e14
...
am: 7444ee791c
2016-08-23 18:27:59 +00:00
Salvador Martinez
3f3ce9595b
Disabled BSM mode switch when plugged in am: d4a6768880
...
am: 18d58269a8
2016-08-23 18:27:52 +00:00
Salvador Martinez
5bbfa0555a
Prevent wifi icon from disappearing am: 5c0063af7e
...
am: 56ebf2a051
2016-08-23 18:26:33 +00:00
Rubin Xu
886af76fb3
Remove duplicated call to authenticationSucceeded()
...
am: 3a437490be
2016-08-23 16:22:49 +00:00
Rubin Xu
7425b2d677
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog
...
am: da9f9a0fab
2016-08-23 16:07:36 +00:00
Doris Ling
0f7d5f36a3
Fix crash when selecting AppInfo for uninstalled app from Recents.
...
am: 7574b64910
2016-08-23 16:07:29 +00:00
Matthew Fritze
7444ee791c
Stop apps with Storage Managers from launching activity when disabled
...
am: 1051fe1e14
2016-08-23 14:43:44 +00:00
Salvador Martinez
18d58269a8
Disabled BSM mode switch when plugged in
...
am: d4a6768880
2016-08-23 14:43:42 +00:00
Salvador Martinez
56ebf2a051
Prevent wifi icon from disappearing
...
am: 5c0063af7e
2016-08-23 14:43:36 +00:00
Rubin Xu
0948ce0cdb
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev
2016-08-23 13:07:02 +00:00
Rubin Xu
7a4ecbac12
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
2016-08-23 12:59:17 +00:00
Doris Ling
6cdd5fccd8
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev
2016-08-23 01:51:21 +00:00
Salvador Martinez
d0e21e9285
can open settings with support tab by default am: 12c5208ad0
...
am: 8d47bdc773
2016-08-22 22:32:20 +00:00
jackqdyulei
8d4a7021dd
Make number in dialog highlighted am: 7a78213776
...
am: 226ccfe62f
2016-08-22 22:32:18 +00:00
jackqdyulei
83c6cfa463
Fix the nullpointer bug in monkey test. am: 409c4708c1
...
am: fbed8d95e9
2016-08-22 22:32:17 +00:00
TreeHugger Robot
88d3cb7176
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
2016-08-22 22:24:15 +00:00
Salvador Martinez
8d47bdc773
can open settings with support tab by default
...
am: 12c5208ad0
2016-08-22 22:20:54 +00:00
jackqdyulei
226ccfe62f
Make number in dialog highlighted
...
am: 7a78213776
2016-08-22 22:20:52 +00:00
jackqdyulei
fbed8d95e9
Fix the nullpointer bug in monkey test.
...
am: 409c4708c1
2016-08-22 22:20:50 +00:00
Salvador Martinez
4c8776627b
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
2016-08-22 21:56:21 +00:00
Salvador Martinez
89d138b724
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
2016-08-22 21:55:18 +00:00
Salvador Martinez
5bd202e277
Merge "can open settings with support tab by default" into nyc-mr1-dev
2016-08-22 21:53:53 +00:00
