Alexey Polyudov
e0eaf67f92
fix the build breakage caused by merge resolution
...
am: f689441eed
2017-02-02 22:06:52 +00:00
Alexey Polyudov
f689441eed
fix the build breakage caused by merge resolution
...
commit 5d409ace19apolyudov@google.com >
(cherry picked from commit 8c041f7862
2017-02-02 21:58:36 +00:00
Daniel Nishi
7cec1bc53c
Use the "fast track" storage calculation for all categories.
...
Bug: 34204877
Test: Settings Robo
Change-Id: I4a3e26e6e96e9b697c1019160c053b079076d3a2
2017-02-02 13:02:32 -08:00
Alexey Polyudov
0d8e3e9405
Merge "fix the build breakage cuased by merge resolution"
2017-02-02 21:01:50 +00:00
Matthew Fritze
43f7fb1b8f
Installed App loader only matches on prefixes
...
Change-Id: Iefc6d681a1b616acf3c1354ff4d0f6c2c268895e
Fixes:34688403
Test: make RunSettingsRoboTests
2017-02-02 13:00:31 -08:00
Alexey Polyudov
8c041f7862
fix the build breakage cuased by merge resolution
...
commit 5d409ace19apolyudov@google.com >
2017-02-02 12:59:50 -08:00
Daniel Nishi
23eb4378d6
Merge "Use the fast track calculation for apps."
2017-02-02 20:48:00 +00:00
Philip P. Moltmann
d7882765da
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev am: 47c8abaa67
...
am: 40046d4316
2017-02-02 19:37:45 +00:00
Philip P. Moltmann
40046d4316
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
...
am: 47c8abaa67
2017-02-02 19:34:48 +00:00
Alexey Polyudov
d872a51339
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
...
am: 5d409ace19
2017-02-02 19:31:06 +00:00
Alexey Polyudov
5d409ace19
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
...
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
2017-02-02 11:11:29 -08:00
TreeHugger Robot
00537955f2
Merge "Hide ConfigureWifiPreference tiles behind Advanced"
2017-02-02 18:08:47 +00:00
TreeHugger Robot
04354e1fda
Merge "Fix string translation by providing context"
2017-02-02 17:41:21 +00:00
TreeHugger Robot
830b06ea73
Merge "Add another work sounds test"
2017-02-02 17:15:01 +00:00
Mihai Niță
421c7d9832
Merge "Fix for Developer-Force RTL removing the locale list"
2017-02-02 17:13:07 +00:00
Robin Lee
9b4309b145
Add another work sounds test
...
This was removed when fixing the 4 broken tests. Here it is again to get
the coverage back to where it was, using mAudioHelper to get the profile
unlocked state this time instead of UserManager directly (where this is
a hidden API, so not something robolectric supports)
Test: make RunSettingsRoboTests
Change-Id: I8bd383ea8a899004a6208968911d60df9b3b17bc
2017-02-02 17:08:05 +00:00
Pavlin Radoslavov
6e5f93c57a
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2 am: 33b4688634
...
am: 068780c052
2017-02-02 16:55:48 +00:00
Robin Lee
806fbef0c6
Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test""
2017-02-02 14:52:16 +00:00
Robin Lee
728d0bc4a0
Revert "Change launcher icons to MaskableIconDrawable Test: manual test"
...
This reverts commit a8bd6c1bb8
2017-02-02 11:33:37 +00:00
Tony Mak
8443894a08
Fix string translation by providing context
...
Bug: 33644656
Test: N/A
Change-Id: I56913f7df01d7f527ad8f2ed86b98c6363251b83
2017-02-02 10:24:39 +00:00
Pavlin Radoslavov
068780c052
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2
...
am: 33b4688634
2017-02-02 04:38:17 +00:00
Pavlin Radoslavov
33b4688634
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
...
am: 0356b740f2
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
...
am: 78115c0abc
2017-02-02 04:32:48 +00:00
Treehugger Robot
78115c0abc
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
2017-02-02 04:29:16 +00:00
Stephen Chen
a7b27b22b9
Hide ConfigureWifiPreference tiles behind Advanced
...
Also reordered the preferences.
Bug: 34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
2017-02-01 17:57:22 -08:00
Pavlin Radoslavov
789d21d475
Add missing null pointer check for Bluetooth A2DP Codec Settings
...
Bug: 34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
2017-02-01 17:43:23 -08:00
TreeHugger Robot
47c8abaa67
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
2017-02-01 23:08:54 +00:00
Daniel Nishi
58543f1dd4
Don't crash in Music Storage Settings.
...
This crash occurs because the music files entry is active, but does
not have an AppEntry (because it is not an app.) ManageApplications
assumes all active elements have an AppEntry, which causes an NPE.
By adding in a null check, we can avoid this.
Bug: 34888282
Test: Manual -- because ManageApplications needs refactoring badly.
Change-Id: Ief0c202f6176d90e492e62e5930b940e5a28b95c
2017-02-01 14:19:28 -08:00
Daniel Nishi
0905600b7a
Use the fast track calculation for apps.
...
This replaces the calculation of the apps category
and add in a calculation for the games category using
the faster GID calculation. This should result in app
sizes loading roughly 10 times after.
Bug: 34204877
Test: Settings unit & robo tests
Change-Id: I78044a8d50f695f8c0a7e04183030232a9719260
2017-02-01 14:02:03 -08:00
Daniel Nishi
d1172942ee
Merge "Add a music apps view to the Storage Settings."
2017-02-01 21:01:56 +00:00
Mihai Nita
efede41864
Fix for Developer-Force RTL removing the locale list
...
Bug: 34359287
Test: manual - added 3 locales, enabled RTL, and checked that the list did not change
Change-Id: I90753ab495fca24d2bfceed10dea363eb8d194a2
2017-02-01 11:45:53 -08:00
Christine Franks
58f729537f
DO NOT MERGE - Require password to FR in carrier demo mode am: 22430d5abb
...
am: 91bd9f3072
2017-02-01 19:17:12 +00:00
Christine Franks
91bd9f3072
DO NOT MERGE - Require password to FR in carrier demo mode
...
am: 22430d5abb
2017-02-01 19:14:41 +00:00
TreeHugger Robot
0d07305ca0
Merge "Change launcher icons to MaskableIconDrawable Test: manual test"
2017-02-01 18:57:54 +00:00
Christine Franks
22430d5abb
DO NOT MERGE - Require password to FR in carrier demo mode
...
Bug: 34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
2017-02-01 09:37:28 -08:00
Robin Lee
b5edf1a7a0
Merge "Fix 4 broken work profile tests"
2017-02-01 14:31:08 +00:00
Rubin Xu
79b4ebffeb
Deprecate old LockPatternUtils.clearLock()
...
New clearLock() requires current password to be supplied
Test: (depends on escrow token CL), add escrow token, clear lockscreen;
verify escrow token is still usable.
Bug: 33126414
Change-Id: Ib248ee2ba8fa2743b038091253fd41401cfa3579
2017-02-01 14:15:06 +00:00
Christine Franks
9c2979e214
DO NOT MERGE - Allow FR in carrier demo mode am: bb6859ca75
...
am: ff43d8f3b7
2017-02-01 02:18:40 +00:00
Christine Franks
ff43d8f3b7
DO NOT MERGE - Allow FR in carrier demo mode
...
am: bb6859ca75
2017-02-01 02:16:17 +00:00
Phil Weaver
55cd7415e6
Merge "Optimize a11y service capabilities"
2017-02-01 02:01:49 +00:00
Hyunyoung Song
a8bd6c1bb8
Change launcher icons to MaskableIconDrawable
...
Test: manual test
b/34853793
Change-Id: I3376c03e84a0a9d94190b930f16596b3e48e9a9d
2017-01-31 17:57:33 -08:00
TreeHugger Robot
cebd60f3b3
Merge "Increase character limit for a string"
2017-02-01 01:26:00 +00:00
Christine Franks
bb6859ca75
DO NOT MERGE - Allow FR in carrier demo mode
...
Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
2017-02-01 00:37:45 +00:00
Salvador Martinez
3bf9c5d57a
Merge "Added survey support to second fragment type"
2017-02-01 00:09:24 +00:00
TreeHugger Robot
e5c2d1fbe3
Merge "Add summary for items in App Usage List in Battery page"
2017-01-31 23:48:28 +00:00
Doris Ling
7a76e9493f
Specify the fragment to launch when default home is clicked.
...
Add the fragment attribute to the default home preference so that it
will launch the DefaultHomePicker when it is clicked.
Change-Id: I6a06dc2fab6a4a5b8bae4e9ec0144e18d2934666
Fixes: 34795157
Test: make SettingsTests and run test
2017-01-31 13:35:47 -08:00
Phil Weaver
1540a9f10c
Optimize a11y service capabilities
...
Bug: 27148522
Test: Trivial change. Verfied that it builds and a11y settings work.
Change-Id: I6684848604a84cf76081517a7b9b72042c74be7c
2017-01-31 13:20:53 -08:00
Christopher Tate
1e99f0ce41
Properly target the factory-reset broadcasts
...
Bug 34587823
Test: attempt factory reset from UI
Change-Id: I4ba65f4b7e07792b37e7587008ad0ab1bc6c1fb0
2017-01-31 20:52:52 +00:00
Julia Reynolds
37326a6023
Merge "Fix notification assistant setting"
2017-01-31 20:46:18 +00:00
Salvador Martinez
09f182c385
Added survey support to second fragment type
...
Settings was totally redesigned which led several
screens to change what type of fragment they
extended. Unfortunately this broke surveys for some
required screens so survey support was added to the
second fragment type to fix this.
Test: Survey tests (robotests)
Bug: 34820704
Change-Id: Ic59b74c17c3d69c67600ce6a56f9f1835d2e1dda
2017-01-31 11:43:07 -08:00
