OSDN Git Service
Tony Mantler [Tue, 27 Sep 2016 21:48:16 +0000 (14:48 -0700)]
Catch all data set changes
Test: Toggle wifi in settings
b/
31649262
Change-Id: I303206f3b977707528e98dfe227b49835edc78f2
Chen Xu [Tue, 27 Sep 2016 18:53:35 +0000 (18:53 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am:
d76a3ed937 am:
022ca70f4f
am:
65df5b4cdc
Change-Id: I7a4ef962ab8e9ca51e0f13cbf7c0c339adf4ac47
fionaxu [Tue, 27 Sep 2016 18:53:20 +0000 (18:53 +0000)]
Avoid run RadioInfo activity from non-system users am:
b54cb2d18c am:
a126537dc1
am:
2581719584
Change-Id: Ie8cd8ffcee12df54bb02f7d86e061f455651fdf8
Chen Xu [Tue, 27 Sep 2016 18:50:33 +0000 (18:50 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am:
d76a3ed937
am:
022ca70f4f
Change-Id: I1f571dc0f44ef804267a5528c6d2176738519684
fionaxu [Tue, 27 Sep 2016 18:50:20 +0000 (18:50 +0000)]
Avoid run RadioInfo activity from non-system users am:
b54cb2d18c
am:
a126537dc1
Change-Id: I36d9fb28f4d341bd4c9d271bfc853f70f9852dd0
Daniel Nishi [Tue, 27 Sep 2016 18:47:55 +0000 (18:47 +0000)]
Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev am:
59d2b185f3 am:
ff18b331df
am:
a988138f14
Change-Id: Id000d2de0816e8898c6230f7a81aa36885ae5b0f
Chen Xu [Tue, 27 Sep 2016 18:47:49 +0000 (18:47 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
am:
d76a3ed937
Change-Id: Id25c4fd9c982f28412445b02e255589f9ede3ab1
fionaxu [Tue, 27 Sep 2016 18:47:49 +0000 (18:47 +0000)]
Avoid run RadioInfo activity from non-system users
am:
b54cb2d18c
Change-Id: I17319eb628b19667fec7a6bba2f376322626bafc
TreeHugger Robot [Tue, 27 Sep 2016 18:46:15 +0000 (18:46 +0000)]
Merge "resolve merge conflicts of
2c826d7 to master"
Chen Xu [Tue, 27 Sep 2016 18:38:18 +0000 (18:38 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
TreeHugger Robot [Tue, 27 Sep 2016 18:24:28 +0000 (18:24 +0000)]
Merge "Avoid over logging preference changes."
TreeHugger Robot [Tue, 27 Sep 2016 18:20:45 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Nishi [Tue, 27 Sep 2016 17:00:09 +0000 (10:00 -0700)]
resolve merge conflicts of
2c826d7 to master
Change-Id: I2b2a1b195f07143690f5902b6a6f78ba1b30d7ea
fionaxu [Thu, 22 Sep 2016 22:01:05 +0000 (15:01 -0700)]
Avoid run RadioInfo activity from non-system users
RadioInfo is hidden from testing menu, but it could be launched
from explicit intents for example. Add system user check to avoid
phone process crash.
Bug:
31219235
Change-Id: I5661fbe0889b1ee9d0dea6810f4a4cde2c9d9e22
Daniel Nishi [Tue, 27 Sep 2016 16:45:10 +0000 (16:45 +0000)]
Merge "Move private volume storage calculations into a shared lib."
Daniel Nishi [Tue, 27 Sep 2016 16:44:27 +0000 (16:44 +0000)]
Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev am:
59d2b185f3
am:
ff18b331df
Change-Id: I5c1616f33cb0808bb1d9ca3ff4abdbb02cede138
Daniel Nishi [Tue, 27 Sep 2016 16:44:11 +0000 (16:44 +0000)]
Fix a deprecated config string name for the storage manager settings. am:
b3405649fa
am:
4a0d18987e
Change-Id: Iba68dc88b4caf19a676619d00dad55954fa96690
Daniel Nishi [Tue, 27 Sep 2016 16:41:11 +0000 (16:41 +0000)]
Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev
am:
59d2b185f3
Change-Id: I013bac8d2d9cdda199a38572604a8b5771c2a40d
Daniel Nishi [Tue, 27 Sep 2016 16:41:10 +0000 (16:41 +0000)]
Fix a deprecated config string name for the storage manager settings.
am:
b3405649fa
Change-Id: I31f5cf3239c5e2c3d2832e6e56280e22e80e27d8
Daniel Nishi [Tue, 27 Sep 2016 16:36:59 +0000 (16:36 +0000)]
Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev
Bill Yi [Tue, 27 Sep 2016 03:25:13 +0000 (03:25 +0000)]
Import translations. DO NOT MERGE am:
7552fb5a17 -s ours am:
78bb14bd6e -s ours am:
1bebf73206 -s ours
am:
b76f78e87f -s ours
Change-Id: I60347edeb91e954fec4d55d5991730435e3df07e
Bill Yi [Tue, 27 Sep 2016 03:25:00 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
98928a1c84 -s ours am:
8317bfb162 -s ours
am:
fef3961612 -s ours
Change-Id: Id72c806318913e613e0be978185159ed1789d026
Bill Yi [Tue, 27 Sep 2016 03:24:45 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am:
47ff6882fb -s ours am:
4c6da8edd9 -s ours
am:
940f2b68d3 -s ours
Change-Id: Ia5abcc8c8a98138c38e0d3a1b2b720ee1042271d
Bill Yi [Tue, 27 Sep 2016 03:20:48 +0000 (03:20 +0000)]
Import translations. DO NOT MERGE am:
7552fb5a17 -s ours am:
78bb14bd6e -s ours
am:
1bebf73206 -s ours
Change-Id: Iac9e3e691bc63b24fe1431d9d956e3b477d45871
Bill Yi [Tue, 27 Sep 2016 03:20:34 +0000 (03:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
98928a1c84 -s ours
am:
8317bfb162 -s ours
Change-Id: I0e1495288c50040063a445a9a47d6d38fee12e94
Bill Yi [Tue, 27 Sep 2016 03:20:20 +0000 (03:20 +0000)]
Import translations. DO NOT MERGE am:
47ff6882fb -s ours
am:
4c6da8edd9 -s ours
Change-Id: I01aa8b418238ad674d5e91e1f38d25ba7a24ee0d
Bill Yi [Tue, 27 Sep 2016 03:12:14 +0000 (03:12 +0000)]
Import translations. DO NOT MERGE am:
7552fb5a17 -s ours
am:
78bb14bd6e -s ours
Change-Id: I67e330583e7436a9be9084a1a93c072204659a29
Bill Yi [Tue, 27 Sep 2016 03:11:48 +0000 (03:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
98928a1c84 -s ours
Change-Id: I2045c7622be7a1f3f13489d68eadd67a27827051
Bill Yi [Tue, 27 Sep 2016 03:11:47 +0000 (03:11 +0000)]
Import translations. DO NOT MERGE
am:
47ff6882fb -s ours
Change-Id: Id685247f25d0ad67354d59471a1106d5a805af69
Bill Yi [Tue, 27 Sep 2016 03:09:19 +0000 (03:09 +0000)]
Import translations. DO NOT MERGE
am:
7552fb5a17 -s ours
Change-Id: I02e5078c47df5c376eb40407870cb630b0bed58f
TreeHugger Robot [Tue, 27 Sep 2016 03:04:03 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Ruben Brunk [Tue, 27 Sep 2016 02:30:50 +0000 (02:30 +0000)]
Merge "Improve text for VR Settings." into nyc-mr1-dev am:
3b90cfc71e am:
64f364ebb6
am:
7c9d08bcaf
Change-Id: I1eea62d10b997fc28d6d31f6f4da51848940900f
Ruben Brunk [Tue, 27 Sep 2016 02:30:35 +0000 (02:30 +0000)]
Improve text for VR Settings. am:
f345b8cb36 am:
5220c925fc
am:
14352821d0
Change-Id: Id4a9d03885dcfda744729eb3635e62f57516ad87
Salvador Martinez [Tue, 27 Sep 2016 02:30:21 +0000 (02:30 +0000)]
Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev am:
04d55c4417 am:
76974a5c19
am:
37d2d0d058
Change-Id: I21b9f57af0f7d68af634ec9606519a4c74fb70b7
Salvador Martinez [Tue, 27 Sep 2016 02:30:07 +0000 (02:30 +0000)]
Added strings for advanced wifi accessibility am:
45f79c2f20 am:
ba0baa312d
am:
3d710bdc70
Change-Id: I4ac7b76f50b66fccd1d04cdc7004e3ed66d6f45d
Ruben Brunk [Tue, 27 Sep 2016 01:11:10 +0000 (01:11 +0000)]
Merge "Improve text for VR Settings." into nyc-mr1-dev am:
3b90cfc71e
am:
64f364ebb6
Change-Id: Idb82cc662e8174cfd70affbf83e64360a1fef134
Ruben Brunk [Tue, 27 Sep 2016 01:10:57 +0000 (01:10 +0000)]
Improve text for VR Settings. am:
f345b8cb36
am:
5220c925fc
Change-Id: I3656ba4555e4e30b5bddf7531429ddd60d175c2f
Ruben Brunk [Tue, 27 Sep 2016 01:08:44 +0000 (01:08 +0000)]
Merge "Improve text for VR Settings." into nyc-mr1-dev
am:
3b90cfc71e
Change-Id: I512eea5a7430fd5195aef6a55b3475f2c4e1f0ab
Ruben Brunk [Tue, 27 Sep 2016 01:08:43 +0000 (01:08 +0000)]
Improve text for VR Settings.
am:
f345b8cb36
Change-Id: I9fef78adc08d9a652d5e008cb019ec5d5364752a
Ruben Brunk [Tue, 27 Sep 2016 00:57:36 +0000 (00:57 +0000)]
Merge "Improve text for VR Settings." into nyc-mr1-dev
Salvador Martinez [Tue, 27 Sep 2016 00:56:14 +0000 (00:56 +0000)]
Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev am:
04d55c4417
am:
76974a5c19
Change-Id: I5d1ea4d3fbe1823d69ee316454a8638afc9a8ad0
Salvador Martinez [Tue, 27 Sep 2016 00:56:01 +0000 (00:56 +0000)]
Added strings for advanced wifi accessibility am:
45f79c2f20
am:
ba0baa312d
Change-Id: I170e9349924f2964d95088ad04a057ec70431530
Stephen Chen [Tue, 27 Sep 2016 00:38:37 +0000 (00:38 +0000)]
Merge "Fix display summary string in Setup Wizard preview screen."
Salvador Martinez [Tue, 27 Sep 2016 00:34:40 +0000 (00:34 +0000)]
Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev
am:
04d55c4417
Change-Id: Ic83ff6a605156d3b3ef2753de2cd1e6392dba248
Salvador Martinez [Tue, 27 Sep 2016 00:34:40 +0000 (00:34 +0000)]
Added strings for advanced wifi accessibility
am:
45f79c2f20
Change-Id: I5207f6b4e2c43e0aaa9e1b4e849f05e25e29b7a8
Salvador Martinez [Tue, 27 Sep 2016 00:26:09 +0000 (00:26 +0000)]
Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev
Salvador Martinez [Tue, 27 Sep 2016 00:07:27 +0000 (17:07 -0700)]
Added strings for advanced wifi accessibility
These strings are needed for talkback to
say the correct thing when a user taps
on advanced options in the dialog to
add a new access point.
Test: Accessibility Scanner
Bug:
30079196
Change-Id: I6208cc01f6434780ba56296769cfaa05b6a6aaaa
Lei Yu [Mon, 26 Sep 2016 23:26:32 +0000 (23:26 +0000)]
Merge "Disable the control of draw over permission for SystemUI"
Ruben Brunk [Mon, 26 Sep 2016 22:48:31 +0000 (15:48 -0700)]
Improve text for VR Settings.
Bug:
31101223
Change-Id: I5c529e76cc6b802cae01301f67dad2e51fb4ad49
Stephen Chen [Mon, 26 Sep 2016 22:36:37 +0000 (15:36 -0700)]
Fix display summary string in Setup Wizard preview screen.
Bug:
31752790
Fixes:
31752790
Test: manual
Change-Id: I4f94dcd123cf9a95a6b3ef605e6575d844e338bb
Andre Eisenbach [Mon, 26 Sep 2016 22:06:07 +0000 (22:06 +0000)]
Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev am:
7a2af50ae3 am:
30a6a743d5
am:
00a224d630
Change-Id: Ib3bd9917d9174996a5af26fb60f0dc54d3e73be1
Andre Eisenbach [Mon, 26 Sep 2016 22:05:52 +0000 (22:05 +0000)]
Move Bluetooth device "Forget" button to the left am:
aece754d77 am:
75e4d44f0d
am:
ecee9e662d
Change-Id: Ibfc862406b4e67426a8686a7090d1ef1a93e7bb3
Andre Eisenbach [Mon, 26 Sep 2016 21:55:25 +0000 (21:55 +0000)]
Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev am:
7a2af50ae3
am:
30a6a743d5
Change-Id: I6fda405cdbb087cd4d20a2fa25d69171336f1b51
Andre Eisenbach [Mon, 26 Sep 2016 21:55:12 +0000 (21:55 +0000)]
Move Bluetooth device "Forget" button to the left am:
aece754d77
am:
75e4d44f0d
Change-Id: If9211aff18dcbcd0f3cfdf47fdbb5f4042fddac6
Andre Eisenbach [Mon, 26 Sep 2016 21:52:14 +0000 (21:52 +0000)]
Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev
am:
7a2af50ae3
Change-Id: I4b5231d5968bc1717a6e91acc3c79f69e84c35ff
Andre Eisenbach [Mon, 26 Sep 2016 21:52:13 +0000 (21:52 +0000)]
Move Bluetooth device "Forget" button to the left
am:
aece754d77
Change-Id: I5732a476c5f6fb6753fc3d8a59b5ce9c293692b1
TreeHugger Robot [Mon, 26 Sep 2016 21:43:46 +0000 (21:43 +0000)]
Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev
Doris Ling [Mon, 26 Sep 2016 20:40:09 +0000 (20:40 +0000)]
Merge "Update gesture settings text." into nyc-mr1-dev am:
ace4753224 am:
ad0d72fee7
am:
ed9fc06b50
Change-Id: I30bbcdf14ea8005894e56774e2364a8f0ec97fa1
Doris Ling [Mon, 26 Sep 2016 20:39:54 +0000 (20:39 +0000)]
Update gesture settings text. am:
8ff630966a am:
5252165f6a
am:
e816be1565
Change-Id: Id12528f90bf67eb3ce66f7fe4ca2fa5b9d8c509a
Doris Ling [Mon, 26 Sep 2016 20:37:38 +0000 (20:37 +0000)]
Merge "Update gesture settings text." into nyc-mr1-dev am:
ace4753224
am:
ad0d72fee7
Change-Id: Ie07ca705d81b2c8e09db4d6498d0e28f3ab9c661
Doris Ling [Mon, 26 Sep 2016 20:37:25 +0000 (20:37 +0000)]
Update gesture settings text. am:
8ff630966a
am:
5252165f6a
Change-Id: I5dcac554e9dd345785b3975ab7af5cab6cfde32f
Doris Ling [Mon, 26 Sep 2016 20:34:54 +0000 (20:34 +0000)]
Merge "Update gesture settings text." into nyc-mr1-dev
am:
ace4753224
Change-Id: Ia0497a0d0ea026eb279246034d16b40fbc2c0902
Doris Ling [Mon, 26 Sep 2016 20:34:53 +0000 (20:34 +0000)]
Update gesture settings text.
am:
8ff630966a
Change-Id: Ic05df8585fc113cf276f0606b680fd4f74e9a208
Doris Ling [Mon, 26 Sep 2016 20:27:39 +0000 (20:27 +0000)]
Merge "Update gesture settings text." into nyc-mr1-dev
jackqdyulei [Mon, 19 Sep 2016 17:00:49 +0000 (10:00 -0700)]
Disable the control of draw over permission for SystemUI
Bug:
31077838
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk \
&& adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I760590f5558f2d686ffbfe78234a8b08e13883fd
Daniel Nishi [Mon, 26 Sep 2016 18:37:52 +0000 (11:37 -0700)]
Fix a deprecated config string name for the storage manager settings.
The old string was used for configuration purposes, but the change was
removed. A previous patch accidentally used the old string for
choosing if the activity was exported or not.
Bug:
31621740
Change-Id: I9471e3a4c6d64d3fb8be7cbfcf058d35364892a5
Doris Ling [Sat, 24 Sep 2016 00:03:00 +0000 (17:03 -0700)]
Update gesture settings text.
Update the preference title and summary for Ambient Display Double-tap
and Pickup gestures.
Test: manual - launch gestures settings and verify latest strings are
used.
Bug:
30595437
Change-Id: I029c2048603563ea20f5030e381a9e7a624d0e85
Bill Yi [Mon, 26 Sep 2016 16:48:57 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cf027c5077ed24be8d68d191a6da201df7fdd0d
Auto-generated-cl: translation import
Bill Yi [Mon, 26 Sep 2016 16:44:05 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f03344d3ce65076256892ae63803239c5c47718
Auto-generated-cl: translation import
Bill Yi [Mon, 26 Sep 2016 16:35:48 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69f2d26ec0a8a06fc611a68740ea9ce5184c124e
Auto-generated-cl: translation import
Fan Zhang [Mon, 26 Sep 2016 16:01:31 +0000 (16:01 +0000)]
Merge "Fix crash when changing data restriction for non-app UID."
Robin Lee [Mon, 26 Sep 2016 15:54:48 +0000 (15:54 +0000)]
Merge "Enable the switch in TrustedCredentialsSettings"
Daniel Nishi [Mon, 26 Sep 2016 09:21:11 +0000 (09:21 +0000)]
Merge "Add storage manager settings activity." into nyc-mr1-dev am:
798a28ace9 am:
4ee3ce5732
am:
8cf30cafff
Change-Id: If1fe711464ea3796a3c2cc3035c92ee66e437e19
Daniel Nishi [Mon, 26 Sep 2016 08:28:28 +0000 (08:28 +0000)]
Add storage manager settings activity. am:
3981889d1d am:
2382850d65
am:
a55d5b6b3a
Change-Id: Ia41298ec0f4640514881c727fa8c6ae35d934458
Doris Ling [Sat, 24 Sep 2016 03:27:48 +0000 (20:27 -0700)]
Fix build error in DisplaySettings
Add static import for android.provider.Settings.Secure.DOZE_ENABLED
Test: make pass
Bug:
31716184
Change-Id: Ia958b3089f3d52897b09072d0dfe4a472176ff89
Fan Zhang [Sat, 24 Sep 2016 00:26:41 +0000 (17:26 -0700)]
Avoid over logging preference changes.
When preference screen is created all prefence goes through
SharedPreferenceLogger once. We don't want to log it as preference
change because it's just initial display. Subsequent preference logger
calls should result in logging.
Bug:
30914916
Test: make RunSettingsRoboTests
Change-Id: Icaee9137c55555f4db7839ff0381a13ccd420190
Doris Ling [Sat, 24 Sep 2016 00:35:32 +0000 (00:35 +0000)]
Merge "Split Ambient Display settings." into nyc-mr1-dev am:
4f8a703d51 am:
f79a9b397e
am:
799388df91
Change-Id: I3368cd81b3c7badf2b1acf5eb0b293c1412b8687
Doris Ling [Sat, 24 Sep 2016 00:35:24 +0000 (00:35 +0000)]
Split Ambient Display settings. am:
1ad58d0abf am:
f89766dbab
am:
0dfe46fe58
Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
Daniel Nishi [Sat, 24 Sep 2016 00:27:22 +0000 (00:27 +0000)]
Merge "Add storage manager settings activity." into nyc-mr1-dev am:
798a28ace9
am:
4ee3ce5732
Change-Id: I575b3ab0ab21cc3af4ee2533e1372bfd4c6ca0ff
Daniel Nishi [Sat, 24 Sep 2016 00:24:59 +0000 (00:24 +0000)]
Add storage manager settings activity. am:
3981889d1d
am:
2382850d65
Change-Id: Ic105308a53273c6705027d13fb2430537116a0ce
Daniel Nishi [Sat, 24 Sep 2016 00:23:38 +0000 (00:23 +0000)]
Merge "Add storage manager settings activity." into nyc-mr1-dev
am:
798a28ace9
Change-Id: If2150702a9ef06c0d4e4469fac2646dce3a259e6
Daniel Nishi [Sat, 24 Sep 2016 00:20:27 +0000 (00:20 +0000)]
Add storage manager settings activity.
am:
3981889d1d
Change-Id: I50224492a1ed42d6aa38fce72a905e35ee672a83
Andre Eisenbach [Sat, 24 Sep 2016 00:13:27 +0000 (17:13 -0700)]
Move Bluetooth device "Forget" button to the left
"Forget" and "OK" actions are too close together.
Bug:
31693959
Change-Id: Iee452347a53b186df7aecad5d971edcfb7645f1d
Daniel Nishi [Sat, 24 Sep 2016 00:15:49 +0000 (00:15 +0000)]
Merge "Add storage manager settings activity." into nyc-mr1-dev
Doris Ling [Sat, 24 Sep 2016 00:07:21 +0000 (00:07 +0000)]
Merge "Split Ambient Display settings." into nyc-mr1-dev am:
4f8a703d51
am:
f79a9b397e
Change-Id: I9a5498d766c23d7d2431706feacf66a7bb1da091
Doris Ling [Sat, 24 Sep 2016 00:07:17 +0000 (00:07 +0000)]
Split Ambient Display settings. am:
1ad58d0abf
am:
f89766dbab
Change-Id: If17ab5951a9b8a2a5b68a1fcc2492de8a72f0c08
Doris Ling [Sat, 24 Sep 2016 00:05:19 +0000 (00:05 +0000)]
Merge "Split Ambient Display settings." into nyc-mr1-dev
am:
4f8a703d51
Change-Id: I0855a17e05c387a63241bfaa5c910d4625e2e5ce
Doris Ling [Sat, 24 Sep 2016 00:05:17 +0000 (00:05 +0000)]
Split Ambient Display settings.
am:
1ad58d0abf
Change-Id: Ie47c7504728bb225214ee8c348af8a154cb5a1f2
TreeHugger Robot [Sat, 24 Sep 2016 00:00:05 +0000 (00:00 +0000)]
Merge "Split Ambient Display settings." into nyc-mr1-dev
Fan Zhang [Fri, 23 Sep 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am:
c5bfd5f5a8 am:
8f621c8cfa
am:
d9d34f78ab
Change-Id: I0a72326065e797603e1cbc3f133250c5cafe257f
Fan Zhang [Fri, 23 Sep 2016 23:57:03 +0000 (23:57 +0000)]
Fix NPE when trying to refreshes dnd condition. am:
98487f4d65 am:
80c589e1f8
am:
f77c940f9a
Change-Id: Ib0f089321000e100dbbf4510ebb9d5bce3b3abca
Fan Zhang [Fri, 23 Sep 2016 23:44:49 +0000 (23:44 +0000)]
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am:
c5bfd5f5a8
am:
8f621c8cfa
Change-Id: I9a05577aed82272d5040a03454289682aa5671fa
Fan Zhang [Fri, 23 Sep 2016 23:44:36 +0000 (23:44 +0000)]
Fix NPE when trying to refreshes dnd condition. am:
98487f4d65
am:
80c589e1f8
Change-Id: I64d75489f6e7066b2303c6e3fc3d4e6b0c8388c6
Fan Zhang [Fri, 23 Sep 2016 23:37:49 +0000 (23:37 +0000)]
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
am:
c5bfd5f5a8
Change-Id: Ie0736338105b670e827b636091ef3235ef872489
Fan Zhang [Fri, 23 Sep 2016 23:37:49 +0000 (23:37 +0000)]
Fix NPE when trying to refreshes dnd condition.
am:
98487f4d65
Change-Id: I27d984f6ebb1de4832d819a843c9cdbfeeabeaf8
Fan Zhang [Fri, 23 Sep 2016 23:31:43 +0000 (23:31 +0000)]
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
Daniel Nishi [Fri, 23 Sep 2016 23:08:47 +0000 (23:08 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am:
3843dd96f5 am:
95ce1811ed
am:
350c9a3ecb
Change-Id: I0de070dc7208e646a8b5d675d3fd299727bbc61c
Daniel Nishi [Fri, 23 Sep 2016 22:52:37 +0000 (22:52 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am:
3843dd96f5
am:
95ce1811ed
Change-Id: I22a87383234d2b909e4402093f587a4f60f52ed2
Daniel Nishi [Fri, 23 Sep 2016 22:51:40 +0000 (22:51 +0000)]
Use a config flag instead of a RO flag for showing Manage Storage. am:
c0b33f70ed am:
bfe5afc270
am:
fee35492b8
Change-Id: I1cddbd4012891ed97907ae392f26330bf528f822
Daniel Nishi [Fri, 23 Sep 2016 22:41:15 +0000 (22:41 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev
am:
3843dd96f5
Change-Id: I6912a4d634152d40a9af1ab98f2303ec8288e55f