OSDN Git Service
Bill Yi [Fri, 3 Feb 2017 09:36:36 +0000 (09:36 +0000)]
Import translations. DO NOT MERGE am:
10246513d7 -s ours
am:
311e4b4212 -s ours
Change-Id: Id30ae7b25ebb3b3851d576ad97f592eafa54dc1e
Bill Yi [Fri, 3 Feb 2017 09:34:34 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
10246513d7 -s ours
Change-Id: I0fa5e10f5b31f605da8ce6555b6a6963c6b1dc3c
Bill Yi [Fri, 3 Feb 2017 07:43:15 +0000 (23:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
Alexey Polyudov [Thu, 2 Feb 2017 22:06:52 +0000 (22:06 +0000)]
fix the build breakage caused by merge resolution
am:
f689441eed
Change-Id: I1e62efcdb09b82c61f864470d8a5c8079832d74e
Alexey Polyudov [Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)]
fix the build breakage caused by merge resolution
commit
5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build
Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit
8c041f786200bed1050e8155aa620c02ab5db5cf)
Alexey Polyudov [Thu, 2 Feb 2017 21:01:49 +0000 (21:01 +0000)]
Merge "fix the build breakage cuased by merge resolution"
Alexey Polyudov [Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)]
fix the build breakage cuased by merge resolution
commit
5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build
Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Daniel Nishi [Thu, 2 Feb 2017 20:47:59 +0000 (20:47 +0000)]
Merge "Use the fast track calculation for apps."
Philip P. Moltmann [Thu, 2 Feb 2017 19:37:45 +0000 (19:37 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev am:
47c8abaa67
am:
40046d4316 -s ours
Change-Id: I2a85de8e679ef4e1517d96c1c5d6eb0b3ea40778
Philip P. Moltmann [Thu, 2 Feb 2017 19:34:48 +0000 (19:34 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
am:
47c8abaa67
Change-Id: I55c9981c4082af3d67cb68ea27147962405ce97d
Alexey Polyudov [Thu, 2 Feb 2017 19:31:06 +0000 (19:31 +0000)]
resolve merge conflicts of
81758edffa to nyc-mr2-dev-plus-aosp
am:
5d409ace19
Change-Id: I90f8afee357fa453e337b657976a1619383a58a5
Alexey Polyudov [Thu, 2 Feb 2017 19:11:29 +0000 (11:11 -0800)]
resolve merge conflicts of
81758edffa to nyc-mr2-dev-plus-aosp
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
TreeHugger Robot [Thu, 2 Feb 2017 18:08:47 +0000 (18:08 +0000)]
Merge "Hide ConfigureWifiPreference tiles behind Advanced"
TreeHugger Robot [Thu, 2 Feb 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Fix string translation by providing context"
TreeHugger Robot [Thu, 2 Feb 2017 17:15:01 +0000 (17:15 +0000)]
Merge "Add another work sounds test"
Mihai Niță [Thu, 2 Feb 2017 17:13:07 +0000 (17:13 +0000)]
Merge "Fix for Developer-Force RTL removing the locale list"
Robin Lee [Tue, 31 Jan 2017 00:09:20 +0000 (00:09 +0000)]
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
Pavlin Radoslavov [Thu, 2 Feb 2017 16:55:48 +0000 (16:55 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am:
78115c0abc am:
0356b740f2 am:
33b4688634
am:
068780c052
Change-Id: I77cd63033413eadb4385d844bb2b83ef9dbef320
Robin Lee [Thu, 2 Feb 2017 14:52:15 +0000 (14:52 +0000)]
Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test""
Robin Lee [Thu, 2 Feb 2017 11:33:37 +0000 (11:33 +0000)]
Revert "Change launcher icons to MaskableIconDrawable Test: manual test"
This reverts commit
a8bd6c1bb8a1f1d7d7d589b2c9339f8201522405.
Change-Id: Iad92e544854776dcb9c4d7d3feeb2ac1b2a411d9
Tony Mak [Thu, 2 Feb 2017 10:21:35 +0000 (10:21 +0000)]
Fix string translation by providing context
Bug:
33644656
Test: N/A
Change-Id: I56913f7df01d7f527ad8f2ed86b98c6363251b83
Pavlin Radoslavov [Thu, 2 Feb 2017 04:38:17 +0000 (04:38 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am:
78115c0abc am:
0356b740f2
am:
33b4688634
Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
Pavlin Radoslavov [Thu, 2 Feb 2017 04:35:49 +0000 (04:35 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am:
78115c0abc
am:
0356b740f2
Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
Pavlin Radoslavov [Thu, 2 Feb 2017 04:32:48 +0000 (04:32 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
am:
78115c0abc
Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
Treehugger Robot [Thu, 2 Feb 2017 04:29:15 +0000 (04:29 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
Stephen Chen [Thu, 2 Feb 2017 01:37:45 +0000 (17:37 -0800)]
Hide ConfigureWifiPreference tiles behind Advanced
Also reordered the preferences.
Bug:
34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
Pavlin Radoslavov [Thu, 2 Feb 2017 01:40:39 +0000 (17:40 -0800)]
Add missing null pointer check for Bluetooth A2DP Codec Settings
Bug:
34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
TreeHugger Robot [Wed, 1 Feb 2017 23:08:53 +0000 (23:08 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
Daniel Nishi [Wed, 1 Feb 2017 22:19:28 +0000 (14:19 -0800)]
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
Daniel Nishi [Wed, 25 Jan 2017 01:36:43 +0000 (17:36 -0800)]
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
Daniel Nishi [Wed, 1 Feb 2017 21:01:51 +0000 (21:01 +0000)]
Merge "Add a music apps view to the Storage Settings."
Mihai Nita [Wed, 1 Feb 2017 19:40:11 +0000 (11:40 -0800)]
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
Christine Franks [Wed, 1 Feb 2017 19:17:12 +0000 (19:17 +0000)]
DO NOT MERGE - Require password to FR in carrier demo mode am:
22430d5abb
am:
91bd9f3072 -s ours
Change-Id: I53b7e747b25eaaa5a7fb9a7fa916d9165d86bc45
Christine Franks [Wed, 1 Feb 2017 19:14:41 +0000 (19:14 +0000)]
DO NOT MERGE - Require password to FR in carrier demo mode
am:
22430d5abb
Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774
TreeHugger Robot [Wed, 1 Feb 2017 18:57:54 +0000 (18:57 +0000)]
Merge "Change launcher icons to MaskableIconDrawable Test: manual test"
Christine Franks [Fri, 20 Jan 2017 19:24:14 +0000 (11:24 -0800)]
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
Robin Lee [Wed, 1 Feb 2017 14:31:07 +0000 (14:31 +0000)]
Merge "Fix 4 broken work profile tests"
Christine Franks [Wed, 1 Feb 2017 02:18:40 +0000 (02:18 +0000)]
DO NOT MERGE - Allow FR in carrier demo mode am:
bb6859ca75
am:
ff43d8f3b7 -s ours
Change-Id: I416b536cca27965db44c4154db580651699588e8
Christine Franks [Wed, 1 Feb 2017 02:16:17 +0000 (02:16 +0000)]
DO NOT MERGE - Allow FR in carrier demo mode
am:
bb6859ca75
Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce
Phil Weaver [Wed, 1 Feb 2017 02:01:39 +0000 (02:01 +0000)]
Merge "Optimize a11y service capabilities"
Hyunyoung Song [Tue, 31 Jan 2017 23:02:30 +0000 (15:02 -0800)]
Change launcher icons to MaskableIconDrawable
Test: manual test
b/
34853793
Change-Id: I3376c03e84a0a9d94190b930f16596b3e48e9a9d
TreeHugger Robot [Wed, 1 Feb 2017 01:25:59 +0000 (01:25 +0000)]
Merge "Increase character limit for a string"
Christine Franks [Tue, 24 Jan 2017 00:44:02 +0000 (16:44 -0800)]
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
Salvador Martinez [Wed, 1 Feb 2017 00:09:23 +0000 (00:09 +0000)]
Merge "Added survey support to second fragment type"
TreeHugger Robot [Tue, 31 Jan 2017 23:48:27 +0000 (23:48 +0000)]
Merge "Add summary for items in App Usage List in Battery page"
Phil Weaver [Tue, 31 Jan 2017 21:20:53 +0000 (13:20 -0800)]
Optimize a11y service capabilities
Bug:
27148522
Test: Trivial change. Verfied that it builds and a11y settings work.
Change-Id: I6684848604a84cf76081517a7b9b72042c74be7c
Christopher Tate [Wed, 25 Jan 2017 22:46:48 +0000 (14:46 -0800)]
Properly target the factory-reset broadcasts
Bug
34587823
Test: attempt factory reset from UI
Change-Id: I4ba65f4b7e07792b37e7587008ad0ab1bc6c1fb0
Julia Reynolds [Tue, 31 Jan 2017 20:46:13 +0000 (20:46 +0000)]
Merge "Fix notification assistant setting"
Salvador Martinez [Tue, 31 Jan 2017 00:49:36 +0000 (16:49 -0800)]
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
Marie Janssen [Tue, 31 Jan 2017 19:28:46 +0000 (19:28 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am:
fb0ab547c2 am:
e10af2add7 am:
5741187f31
am:
43e2d0a759
Change-Id: I227d5c656c6079b5bcbfcee7c1028fcaf2a8d083
Pavlin Radoslavov [Tue, 31 Jan 2017 19:25:30 +0000 (19:25 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50 am:
96dda78d24 am:
6fbaebd7e8
am:
502de2cfa2
Change-Id: Ib894f4f4f2587cda27cdf6c4e3dba70a7fdbc0d0
Marie Janssen [Tue, 31 Jan 2017 19:24:12 +0000 (19:24 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am:
fb0ab547c2 am:
e10af2add7
am:
5741187f31
Change-Id: I7ecebb4aebb9755571baebf00718156d28415f3e
Pavlin Radoslavov [Tue, 31 Jan 2017 19:18:46 +0000 (19:18 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50 am:
96dda78d24
am:
6fbaebd7e8
Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
Marie Janssen [Tue, 31 Jan 2017 19:16:35 +0000 (19:16 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am:
fb0ab547c2
am:
e10af2add7
Change-Id: I29267583329aba9eae91863e83641a00f12cae9d
Marie Janssen [Tue, 31 Jan 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
am:
fb0ab547c2
Change-Id: Ib054cb7d23a28d45345ef680247b5788fbc989f4
Pavlin Radoslavov [Tue, 31 Jan 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50
am:
96dda78d24
Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
Marie Janssen [Tue, 31 Jan 2017 19:09:34 +0000 (19:09 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
Pavlin Radoslavov [Tue, 31 Jan 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Update the A2DP Codec Config API"
am:
bd298a7a50
Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
Pavlin Radoslavov [Tue, 31 Jan 2017 19:02:35 +0000 (19:02 +0000)]
Merge "Update the A2DP Codec Config API"
Doris Ling [Tue, 31 Jan 2017 18:14:40 +0000 (18:14 +0000)]
Merge "Make UsersDashboardAlias primary profile controlled."
William Mee [Tue, 31 Jan 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Adds a default for the badging curve thresholds to Settings app resources; this will be the fall-back default used by the WifiSettings in follow-on work."
Julia Reynolds [Tue, 31 Jan 2017 15:47:57 +0000 (10:47 -0500)]
Fix notification assistant setting
Test: make cts-verifier
Change-Id: I9029e792ef3d32e433012d86ba828e3c741799cb
Bill Yi [Tue, 31 Jan 2017 08:47:00 +0000 (08:47 +0000)]
Import translations. DO NOT MERGE am:
2a3b062c4a -s ours
am:
bb2a8f15cb -s ours
Change-Id: I41d1afe145de55b33b6b20db3392d99e3debed19
Bill Yi [Tue, 31 Jan 2017 08:42:59 +0000 (08:42 +0000)]
Import translations. DO NOT MERGE
am:
2a3b062c4a -s ours
Change-Id: Ic11826d8d728ca3324bd0bc75455ccf6fe7c3008
Bill Yi [Tue, 31 Jan 2017 07:10:41 +0000 (23:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
songchenxi [Tue, 31 Jan 2017 03:09:01 +0000 (19:09 -0800)]
Increase character limit for a string
Increase the "App-level permission" string's character limit from 30
to 42
Test: Manual
bug:
34810404
Change-Id: Idaf7495ee45a55afc4fa5a9541f2ed12b9e76386
Philip P. Moltmann [Mon, 12 Dec 2016 23:29:55 +0000 (15:29 -0800)]
[DO NOT MERGE] Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests
Bug:
33385963
Bug:
30662828
Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit
231c9fbfa68d54ce44fad36df0701d4fd566a5aa)
Stephen Chen [Tue, 31 Jan 2017 02:08:35 +0000 (02:08 +0000)]
Merge "Move AdvancedWifiSettings into ConfigureWifiSettings."
Pavlin Radoslavov [Sat, 28 Jan 2017 01:19:56 +0000 (17:19 -0800)]
Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
1. The current codec config
2. The list of codecs containing the local codecs capabilities
3. The list of codecs containing the selectable codecs capabilities.
This list is the intersection of the local codecs capabilities
and the capabilities of the paired device.
Also, refactored the Java internals to accomodate the extra information:
* Added new class BluetoothCodecStatus that contains the extra info:
current codec config, local codecs capabilities and selectable
codecs capabilities
* Renamed method getCodecConfig() to getCodecStatus() and return the
corresponding BluetoothCodecStatus object.
* Updates to class BluetoothCodecConfig:
new methods isValid(), getCodecName(), and updated toString()
so it is more user friendly
* Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
EXTRA_PREVIOUS_CODEC_CONFIG.
The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
the latter is not really used.
Test: A2DP streaming with headsets and switching the codecs
Change-Id: I490a70c82b686be7105862aeaeafcff495369dae
Robin Lee [Tue, 31 Jan 2017 00:08:52 +0000 (00:08 +0000)]
Fix 4 broken work profile tests
Commit
2953f31b61fb8c8c1334ecbf7f65d0de05776f06 skipped
RunSettingsRoboTests. The tests started failing because
WorkSoundPreferenceController calls UserManager.isUserUnlocked(int) now
which is not implemented in robolectric.
Fixed by adding a wrapper method to AudioHelper.
Fix:
34819603
Test: make RunSettingsRoboTests
Change-Id: Ia79cc4def9442706752f7e7b9a895ffa8150fd9d
Maurice Lam [Mon, 30 Jan 2017 23:52:25 +0000 (23:52 +0000)]
Merge "Suppress failing Settings Robolectric tests"
Stephen Chen [Thu, 26 Jan 2017 01:34:09 +0000 (17:34 -0800)]
Move AdvancedWifiSettings into ConfigureWifiSettings.
Bug:
34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.
Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
Julia Reynolds [Fri, 27 Jan 2017 13:51:23 +0000 (08:51 -0500)]
Show channel groups in settings.
Test: manual
Change-Id: Icfaed2d2d898245fcfa50b25d7ad456e4db07bae
Julia Reynolds [Mon, 30 Jan 2017 19:37:01 +0000 (19:37 +0000)]
Merge "Audio attributes"
Marie Janssen [Sat, 28 Jan 2017 02:57:39 +0000 (18:57 -0800)]
Bluetooth: remove unused SINK_STATE_CHANGED action
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is unused.
Test: compiles
Bug:
34395439
Change-Id: I5c347886fdf9dbdf15feb82f2a9622dd22f010b6
Marie Janssen [Mon, 30 Jan 2017 18:21:05 +0000 (10:21 -0800)]
resolve merge conflicts of
1c98d85cf6 to master
Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231
Marie Janssen [Mon, 30 Jan 2017 18:02:01 +0000 (18:02 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am:
1ad23a71e4 am:
184506a710
am:
83fb10ae1e
Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
Marie Janssen [Mon, 30 Jan 2017 17:57:11 +0000 (17:57 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am:
1ad23a71e4
am:
184506a710
Change-Id: I6114e7b4617e7f23373434a54672497654d6d786
Marie Janssen [Mon, 30 Jan 2017 17:51:50 +0000 (17:51 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am:
1ad23a71e4
Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
Marie Janssen [Mon, 30 Jan 2017 17:46:17 +0000 (17:46 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
Anton Philippov [Mon, 30 Jan 2017 16:39:41 +0000 (16:39 +0000)]
Merge "Add a screen to show OEM backup settings."
Anton Philippov [Wed, 25 Jan 2017 20:37:36 +0000 (20:37 +0000)]
Add a screen to show OEM backup settings.
Moves the backup settings logic to BackupSettingsHelper and
BackupSettingsActivity:
- If the manufacturer provides the intent and the label for their backup
settings in the config.xml, a new intermediate fragment is shown for
Backup settings to let the user pick either standard backup settings or
OEM provided backup settings.
- If config.xml doesn't contain the intent, BackupSettingsActivity is
used as a trampoline activity to launch backup settings provided by the
backup transport of the default backup settings activity, i.e.
PrivacySettingsActivity.
Bug:
34700410
Bug:
33655074
Bug:
33654991
Test: make RunSettingsRoboTests
Change-Id: I78e340fbf926b2a9dc2c4e3942f9337c3c7a933c
Nicolas Prévot [Mon, 30 Jan 2017 11:24:00 +0000 (11:24 +0000)]
Merge "Add policy transparency to Settings > device administrators"
Maurice Lam [Sat, 28 Jan 2017 04:37:40 +0000 (20:37 -0800)]
Suppress failing Settings Robolectric tests
- Assume API 24 for some settings robolectric tests since they are
broken by referencing API new in version 24. Those tests will be
ignored until Robolectric is updated to support SDK 24.
- Comment out failing DatabaseIndexingManagerTest.
Test: cd tests/robotests && mma
Change-Id: Id71211b7a6836d55f31524c4cfe9628c2de78097
Daniel Nishi [Fri, 27 Jan 2017 22:57:33 +0000 (22:57 +0000)]
Merge "Go to the old storage settings when using non-internal storage."
jackqdyulei [Fri, 20 Jan 2017 18:58:51 +0000 (10:58 -0800)]
Add summary for items in App Usage List in Battery page
This summary shows the active time of the app. For example
"Used for 27m".
Bug:
34467139
Test: RunSettingsRoboTests & Take screenshots
Change-Id: I0ef48427ad21be4dacd290fffb2c5d519ef58506
Doris Ling [Fri, 27 Jan 2017 21:13:17 +0000 (13:13 -0800)]
Make UsersDashboardAlias primary profile controlled.
Add PRIMARY_PROFILE_CONTROLLED metadata to UsersDashboardAlias and
add it to the Settings list for restricted user, so that it will be
shown to other users.
Change-Id: I9c090b15c3dced75eb7a405bd109ca7fb51807ab
Fix:
34194505
Test: Visual
TreeHugger Robot [Fri, 27 Jan 2017 20:49:03 +0000 (20:49 +0000)]
Merge "Move intent action to xml"
Salvador Martinez [Fri, 27 Jan 2017 20:37:29 +0000 (20:37 +0000)]
Merge "Remove fake data" into nyc-mr2-dev am:
d258b2f40f -s ours
am:
14db171c1b -s ours
Change-Id: I74408491dfeb629b39afa874fb166856a1d85f6e
Salvador Martinez [Fri, 27 Jan 2017 20:37:13 +0000 (20:37 +0000)]
Remove fake data am:
a1499c3005 -s ours
am:
a7b1c967b7 -s ours
Change-Id: If6738d1bba8dd8207b79c0082799ba24a09062f0
TreeHugger Robot [Fri, 27 Jan 2017 20:35:29 +0000 (20:35 +0000)]
Merge "modified settings to use settingslib class"
Salvador Martinez [Fri, 27 Jan 2017 20:34:41 +0000 (20:34 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
am:
d258b2f40f -s ours
Change-Id: Ic418e0cbdd54679f0af152b13f52f34d963da8b6
Salvador Martinez [Fri, 27 Jan 2017 20:34:39 +0000 (20:34 +0000)]
Remove fake data
am:
a1499c3005 -s ours
Change-Id: Iea66d48fba72ff28bbc81a1499084a9afcd1e569
TreeHugger Robot [Fri, 27 Jan 2017 20:31:39 +0000 (20:31 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
Julia Reynolds [Fri, 27 Jan 2017 20:18:51 +0000 (15:18 -0500)]
Audio attributes
Test: manual
Change-Id: I4f298019a42520370a3867e332274abe299cff2d
Salvador Martinez [Fri, 27 Jan 2017 20:05:17 +0000 (20:05 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev am:
4edcb927ab
am:
387fdd058e -s ours
Change-Id: I05efb9a970bbd055d37a7bcf7a204675109d4001
Salvador Martinez [Fri, 27 Jan 2017 20:05:09 +0000 (20:05 +0000)]
Fix null pointer exception when surveys are turned off am:
9db3cb3bee
am:
e2904eb7fa -s ours
Change-Id: I3ebd619327fa399e8fab9ead6e1de63a67ce1306
Salvador Martinez [Fri, 27 Jan 2017 20:03:12 +0000 (20:03 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
am:
4edcb927ab
Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc
Salvador Martinez [Fri, 27 Jan 2017 20:03:08 +0000 (20:03 +0000)]
Fix null pointer exception when surveys are turned off
am:
9db3cb3bee
Change-Id: I9f71f40a715cfb65d8a5bc53fed64e674bd0515d
TreeHugger Robot [Fri, 27 Jan 2017 19:59:03 +0000 (19:59 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev