OSDN Git Service
Phil Weaver [Thu, 16 Mar 2017 21:52:31 +0000 (14:52 -0700)]
A11y shortcut settings enhancement
Adding shortcut on/off switch, improving the service picker,
and adding a switch to enable the shortcut on the lock screen.
Also adjusted setting search code to avoid indexing the
accessibility shortcut aside from the main accessibility settings
page.
Bug:
35872328
Bug:
35219988
Test: Ran in a variety of conditions, ran existing settings test.
Also added basic robo test, verified existing robo tests pass.
Change-Id: I4da9bad74caf96d9c8f3640e7db5417b4ee5d602
Lei Yu [Fri, 24 Mar 2017 20:01:22 +0000 (20:01 +0000)]
Merge "Change dialog theme for dialog activity."
Casey Burkhardt [Fri, 24 Mar 2017 19:35:19 +0000 (19:35 +0000)]
Merge "Updates to Magnification Settings"
TreeHugger Robot [Fri, 24 Mar 2017 19:11:08 +0000 (19:11 +0000)]
Merge "Use DevicePolicyManager#isSecurityLoggingEnabled"
TreeHugger Robot [Fri, 24 Mar 2017 18:50:48 +0000 (18:50 +0000)]
Merge "Set about phone subtext to device model string."
Yohei Yukawa [Fri, 24 Mar 2017 18:50:23 +0000 (18:50 +0000)]
Merge "Deprecate IMM#showSoftInputUnchecked() part 2"
TreeHugger Robot [Fri, 24 Mar 2017 16:53:00 +0000 (16:53 +0000)]
Merge "Add strings for default apps"
Sergio Sancho [Fri, 24 Mar 2017 16:43:03 +0000 (16:43 +0000)]
Merge "Adding new strings for the Settings changes on TTS for Android O."
Robin Lee [Fri, 24 Mar 2017 16:24:59 +0000 (16:24 +0000)]
Merge "String for blank security "user credentials" page"
TreeHugger Robot [Fri, 24 Mar 2017 15:26:45 +0000 (15:26 +0000)]
Merge "Hide potentially invisible DO Disclosures by default"
Denis Kuznetsov [Tue, 21 Mar 2017 21:04:13 +0000 (22:04 +0100)]
Add strings for default apps
Bug:
32692748
Test: none
Change-Id: Ie37b70901463e763794bf4882c223623e46cb51a
TreeHugger Robot [Fri, 24 Mar 2017 14:27:50 +0000 (14:27 +0000)]
Merge "Enterprise string clean-up for O"
TreeHugger Robot [Fri, 24 Mar 2017 14:20:41 +0000 (14:20 +0000)]
Merge "Update List of apps on device string, remove "XX apps" string."
Sergio Sancho [Fri, 24 Mar 2017 13:36:21 +0000 (13:36 +0000)]
Adding new strings for the Settings changes on TTS for Android O.
Change-Id: Ic984dfe3c9d1a1f8a308e5250d497f9024619421
Test: mmm -j20 packages/apps/Settings
Change-Id: I0e83c3793797da4488ce767e46f4597b3b66ab9e
Bartosz Fabianowski [Fri, 24 Mar 2017 13:35:49 +0000 (14:35 +0100)]
Use DevicePolicyManager#isSecurityLoggingEnabled
Now that this method has been opened up to callers with system UID,
use it.
Bug:
36584321
Test: Settings runs (it would crash if it had no access to the method)
Change-Id: I30254ab08e434d5e2b58f41ddaf7d85b4dcd96b0
Bartosz Fabianowski [Fri, 24 Mar 2017 10:28:09 +0000 (11:28 +0100)]
Hide potentially invisible DO Disclosures by default
Hiding/unhiding a pref triggers an animation. DO Disclosures that may
not be visible should be hidden by default so that they fade in if
applicable, not fade out if not applicable.
Also, the network and security logging disclosures should only be shown
if logging is currently on or was on in the past and a network log was
retrieved at least once.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I8c85f2f66ba295f145e5f5e79febb1b1a9bc6ede
Robin Lee [Fri, 24 Mar 2017 13:29:11 +0000 (13:29 +0000)]
String for blank security "user credentials" page
This is shown when the user doesn't have any private keys in TPM yet.
Bug:
30878596
Change-Id: Ic24acf4b5251ec442babfddd4d4212e05c461ec4
Julia Reynolds [Thu, 23 Mar 2017 15:06:26 +0000 (11:06 -0400)]
Notification & DND string changes
Test: make
Change-Id: I4273683184b109d055eb4706a640521a59f6faa1
Fixes:
36539297
Charles He [Thu, 23 Mar 2017 21:50:03 +0000 (21:50 +0000)]
Enterprise string clean-up for O
Bug:
34326838
Test: make
Change-Id: I10fc5c2b377f0c0f0cf68732c2af6e01e270844f
Denis Kuznetsov [Wed, 22 Mar 2017 14:41:38 +0000 (15:41 +0100)]
Update List of apps on device string,
remove "XX apps" string.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I64f833497b5362f95cfc56a1057d97d9539ff029
Casey Burkhardt [Thu, 23 Mar 2017 01:19:19 +0000 (18:19 -0700)]
Updates to Magnification Settings
Restructures accessibility settings to support multiple
magnification modes.
Removes "preview" behavior within magnification settings
Test: Manual
Bug:
30960346
Bug:
36136580
Change-Id: I9f95b8ef2460f5178336e8cb44b10a2553d28ea9
TreeHugger Robot [Fri, 24 Mar 2017 02:25:47 +0000 (02:25 +0000)]
Merge "Sort saved networks using case insensitive order."
TreeHugger Robot [Fri, 24 Mar 2017 01:26:23 +0000 (01:26 +0000)]
Merge "Update string for Apps & notifications page."
TreeHugger Robot [Fri, 24 Mar 2017 01:16:41 +0000 (01:16 +0000)]
Merge "Update string for battery optimization dialog"
TreeHugger Robot [Fri, 24 Mar 2017 01:12:58 +0000 (01:12 +0000)]
Merge "Set WIFI_IP_SETTINGS as intent for ConfigureWifiSettings."
TreeHugger Robot [Fri, 24 Mar 2017 00:50:33 +0000 (00:50 +0000)]
Merge "Add test for UserSetting's summary provider."
TreeHugger Robot [Fri, 24 Mar 2017 00:47:36 +0000 (00:47 +0000)]
Merge "Change "When in VR mode" to full screen radio button picker"
Amin Shaikh [Fri, 24 Mar 2017 00:43:59 +0000 (17:43 -0700)]
Sort saved networks using case insensitive order.
Bug:
36570745
Test: m RunSettingsRoboTests
Change-Id: Ie2b2d6dc012429f3ac57f24db26720e67e0bac13
Fan Zhang [Thu, 23 Mar 2017 23:42:13 +0000 (16:42 -0700)]
Set about phone subtext to device model string.
Also remove useless custom preference
Fix:
36395109
Test: robotests
Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
TreeHugger Robot [Fri, 24 Mar 2017 00:10:36 +0000 (00:10 +0000)]
Merge "Fix bug: UserPreference's gear icon got accidentally hidden"
TreeHugger Robot [Thu, 23 Mar 2017 23:42:14 +0000 (23:42 +0000)]
Merge "Update string for Connected devices page."
TreeHugger Robot [Thu, 23 Mar 2017 23:36:55 +0000 (23:36 +0000)]
Merge "Update text for security & screen lock page."
Doris Ling [Thu, 23 Mar 2017 23:30:13 +0000 (16:30 -0700)]
Update string for Apps & notifications page.
Bug:
36376411
Test: builds
Change-Id: I3d1d9535f9aed652857f010e3f935f7edf132dd2
Doris Ling [Thu, 23 Mar 2017 23:06:36 +0000 (16:06 -0700)]
Add test for UserSetting's summary provider.
Change-Id: I5197c109f65f4049e27e704552a2206b19919df3
Fix:
36540644
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 23 Mar 2017 22:48:15 +0000 (15:48 -0700)]
Update string for battery optimization dialog
Change-Id: Iea95bec173ac6cdabc10c32ae51604f190f6f42f
Fix:
36569198
Test: builds
Fan Zhang [Thu, 23 Mar 2017 21:38:53 +0000 (14:38 -0700)]
Fix bug: UserPreference's gear icon got accidentally hidden
Change-Id: I9715c3aff20ca8b7a324bd2f8629755690ddc119
Fix:
36545470
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 23 Mar 2017 22:24:01 +0000 (22:24 +0000)]
Merge "Update settings homepage summary text."
TreeHugger Robot [Thu, 23 Mar 2017 22:22:24 +0000 (22:22 +0000)]
Merge "Split the plurals strings with zero quantity."
Daniel Nishi [Thu, 23 Mar 2017 22:16:18 +0000 (22:16 +0000)]
Merge "Add icons to the main static storage setting prefs."
TreeHugger Robot [Thu, 23 Mar 2017 21:45:35 +0000 (21:45 +0000)]
Merge "Changed the ambient display setting name"
Doris Ling [Thu, 23 Mar 2017 21:42:01 +0000 (14:42 -0700)]
Update text for security & screen lock page.
Bug:
36540633
Test: builds
Change-Id: I68c5243aaf359a69cdd6632dd8009bbb1357d99a
TreeHugger Robot [Thu, 23 Mar 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Update text for Users & accounts page."
TreeHugger Robot [Thu, 23 Mar 2017 21:21:52 +0000 (21:21 +0000)]
Merge "Update the donut view to handle new string."
TreeHugger Robot [Thu, 23 Mar 2017 21:13:57 +0000 (21:13 +0000)]
Merge "Refactor DefaultAppPicker to a general radio button picker"
TreeHugger Robot [Thu, 23 Mar 2017 20:56:48 +0000 (20:56 +0000)]
Merge "Update the system info dialog."
Doris Ling [Mon, 20 Mar 2017 23:09:58 +0000 (16:09 -0700)]
Update settings homepage summary text.
- add prefix to storage summary
- update Sound summary to upper case DND
- update System summary text to add time.
Change-Id: Ic0c66c0fefee1a1f1556775d82b5431bbae73600
Bug:
36375846
Test: builds
Fan Zhang [Thu, 23 Mar 2017 20:13:36 +0000 (13:13 -0700)]
Change "When in VR mode" to full screen radio button picker
Change-Id: I619af85f9c4a2c32daca786f49e898fde9b593f8
Fix:
36557316
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 23 Mar 2017 20:43:40 +0000 (20:43 +0000)]
Merge "Update strings for work sounds"
Doris Ling [Thu, 23 Mar 2017 19:07:16 +0000 (12:07 -0700)]
Update string for Connected devices page.
- update Bluetooth summary text "Connected to" and "Not connected"
- update USB summary text "Charging" and "Supplying"
- update Printing summary to "... on" or "off
Change-Id: I39a809b560a5c6cc6a0e217315dfabb2c4d1a129
Fix:
36234108
Test: builds
TreeHugger Robot [Thu, 23 Mar 2017 20:05:33 +0000 (20:05 +0000)]
Merge "Add page Settings->Security & lock screen->Lock screen preferences."
Selim Cinek [Thu, 23 Mar 2017 20:01:28 +0000 (13:01 -0700)]
Changed the ambient display setting name
The new screen is now called Incoming notification screen
Bug:
36516811
Change-Id: I71f9a6e86b0fd98a8c39e3ed19208366cea1892e
Doris Ling [Thu, 23 Mar 2017 18:10:14 +0000 (11:10 -0700)]
Update text for Users & accounts page.
- add back the summary loader for UserSettings
- remove "configure" preference category
- add summary for Auto sync data and update the title
Change-Id: Ia00397f775f86d0e160a54783a8518847fce8de8
Bug:
36540644
Test: builds
Fan Zhang [Thu, 23 Mar 2017 18:03:29 +0000 (11:03 -0700)]
Refactor DefaultAppPicker to a general radio button picker
Bug:
36557316
Test: make RunSettingsRoboTests
Change-Id: I52985e527e55697cf29f8d97d775d4bbed025beb
TreeHugger Robot [Thu, 23 Mar 2017 19:39:24 +0000 (19:39 +0000)]
Merge "Finalize strings for enterprise privacy"
Stephen Chen [Wed, 22 Mar 2017 22:53:26 +0000 (15:53 -0700)]
Set WIFI_IP_SETTINGS as intent for ConfigureWifiSettings.
Bug:
34392691
Test: make, test intent on device.
Change-Id: Iaf692c0bff25763606d0c4cf0626ad13d0249d2f
Robin Lee [Thu, 23 Mar 2017 18:35:14 +0000 (18:35 +0000)]
Update strings for work sounds
Test: manual inspection, see pictures
Change-Id: Ib0bc4b95ee6edaefe18cbabbd9c23a6883aa9e97
Doris Ling [Thu, 16 Mar 2017 20:20:15 +0000 (13:20 -0700)]
Add page Settings->Security & lock screen->Lock screen preferences.
- add the new preference screen that contains configuration for lock
screen notification, add user when locked, and owner info.
- refactor SecuritySettings to use the new owner info controller.
Fix:
36163515
Test: make RunSettingsRoboTests
Change-Id: I3bada8f652f89ed0af7aebc03f0bf2f637296b4d
TreeHugger Robot [Thu, 23 Mar 2017 18:31:21 +0000 (18:31 +0000)]
Merge "Update final Wi-Fi strings."
Ajay Panicker [Thu, 23 Mar 2017 18:08:44 +0000 (18:08 +0000)]
Merge "AVRCP version interop pereference (2/3)" am:
db66a7b664 am:
da582fa40d
am:
0ae97550ee -s ours
Change-Id: Ibe4bc0f1bc067d2fb7560e2b03e09e1dea8c70ee
Ajay Panicker [Thu, 23 Mar 2017 18:03:57 +0000 (18:03 +0000)]
Merge "AVRCP version interop pereference (2/3)" am:
db66a7b664
am:
da582fa40d
Change-Id: I79cb69494d6d3860494f4fa36f44095e1d2c6c6f
Ajay Panicker [Thu, 23 Mar 2017 17:56:28 +0000 (17:56 +0000)]
Merge "AVRCP version interop pereference (2/3)"
am:
db66a7b664
Change-Id: Ia70a81c027d2e81b01f279c2816de41ef915c0f8
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (2/3)"
Daniel Nishi [Mon, 27 Feb 2017 19:28:04 +0000 (11:28 -0800)]
Add icons to the main static storage setting prefs.
The dynamic user icons require more than just XML changes to
successfully fetch the badged user icons and are coming in a future
patch.
Bug:
35801039
Test: Manual -- this is purely XML and comment changes.
Change-Id: Id493c0335037a5c6e4f8b4734700611bfc0da7f1
Daniel Nishi [Tue, 21 Mar 2017 20:32:13 +0000 (13:32 -0700)]
Update the donut view to handle new string.
Change-Id: Idb5cec6d8169f3d229375faecc4bf96501481112
Fixes:
36224266
Test: Manually verified
Bartosz Fabianowski [Thu, 23 Mar 2017 15:19:52 +0000 (16:19 +0100)]
Finalize strings for enterprise privacy
A few more final string tweaks for the enterprise privacy page.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: Ib955aa5a6e756748ed7422021099234ad3fefa8b
TreeHugger Robot [Thu, 23 Mar 2017 17:16:19 +0000 (17:16 +0000)]
Merge "Update print setting summary to show number of services"
TreeHugger Robot [Thu, 23 Mar 2017 16:51:06 +0000 (16:51 +0000)]
Merge "Update string for Do not disturb preference."
TreeHugger Robot [Thu, 23 Mar 2017 16:02:01 +0000 (16:02 +0000)]
Merge "Move "scanning" from location setting actionbar to pref xml"
TreeHugger Robot [Thu, 23 Mar 2017 15:31:44 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Rubin Xu [Thu, 23 Mar 2017 14:04:08 +0000 (14:04 +0000)]
Merge "Adjust text during work challenge unification"
TreeHugger Robot [Thu, 23 Mar 2017 13:55:59 +0000 (13:55 +0000)]
Merge "New iteration of the Text-to-Speech settings."
Bill Yi [Thu, 23 Mar 2017 13:27:40 +0000 (06:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id7690c22731b76968d733207154ce3554ce73527
Auto-generated-cl: translation import
Rubin Xu [Thu, 23 Mar 2017 09:44:58 +0000 (09:44 +0000)]
Adjust text during work challenge unification
Bug:
32205706
Test: Create work profile; untick "use one lock"; retick "use one lock"; observe new string
Change-Id: I3933ac8067e95e434478da9ecc1a419d24661e26
Charles He [Thu, 23 Mar 2017 08:49:46 +0000 (08:49 +0000)]
Merge "VPN settings: gray out always-on checkbox dynamically"
TreeHugger Robot [Thu, 23 Mar 2017 05:09:49 +0000 (05:09 +0000)]
Merge "Add double-tap & lift gestures to display settings"
TreeHugger Robot [Thu, 23 Mar 2017 03:03:48 +0000 (03:03 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
Amin Shaikh [Thu, 23 Mar 2017 02:46:09 +0000 (19:46 -0700)]
Update final Wi-Fi strings.
Note that this is simply a string checkin. Additional work is needed to
use some of these strings.
Bug:
36449837
Bug:
36532777
Bug:
35993748
Test: make RunSettingsRoboTests
Change-Id: Ica24c2e9a58cc7b190bec8b7c6a0c5463849aaa1
Fan Zhang [Thu, 23 Mar 2017 00:43:20 +0000 (17:43 -0700)]
Update print setting summary to show number of services
-Also some minor cleanup in print setting fragment (create pref using
correct context)
Change-Id: Ic05027ee53fd318da6ccd38c9ed98ce10ca49ba8
Fix:
36234108
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 23 Mar 2017 01:26:47 +0000 (01:26 +0000)]
Merge changes from topic 'two_target_preference'
* changes:
Update string character limit
Convert BT preference to use TwoTargetPreference
Refactor the layout for MasterSwitch to a 2 target pref
Andrew Sapperstein [Thu, 23 Mar 2017 01:00:47 +0000 (18:00 -0700)]
Add double-tap & lift gestures to display settings
Now they're in both languages & input and display.
Change-Id: Ib0d9fa1aa39656662307e2fc8fda70443f1ae8ed
Fixes:
36415612
Test: robotests
Ajay Panicker [Thu, 23 Mar 2017 00:43:51 +0000 (17:43 -0700)]
Add default value to Bluetooth AVRCP version property get
When the property isn't set a crash can occur since we try to look up an
empty property value.
Bug:
36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
Sanket Padawe [Thu, 23 Mar 2017 01:07:13 +0000 (01:07 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am:
bd9ce2e4b1 am:
f54df6ccfb
am:
5642aa4ae8 -s ours
Change-Id: Ida22695c5e2d9e7db21a71821d6b7efb4ceeb4e3
Sanket Padawe [Thu, 23 Mar 2017 00:58:29 +0000 (00:58 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am:
bd9ce2e4b1
am:
f54df6ccfb
Change-Id: I317f715ee814ee1511e67cc57e11ea43af9a2a4c
Sanket Padawe [Thu, 23 Mar 2017 00:45:56 +0000 (00:45 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am:
bd9ce2e4b1
Change-Id: I361f7c1747ab1f16cce149d78cc219f83a16948c
TreeHugger Robot [Thu, 23 Mar 2017 00:21:05 +0000 (00:21 +0000)]
Merge "Add summary text for wallpaper settings."
Fan Zhang [Wed, 22 Mar 2017 23:38:57 +0000 (16:38 -0700)]
Move "scanning" from location setting actionbar to pref xml
This fixes the breadcrumb for scanning settings when you search "scan".
- Also did some minor cleanup in LocationSettings (creating preference
using the correct context)
Change-Id: I8efc62246f2e18b2bd4b5eb411b40f24e36b0f2a
Fix:
36529569
Test: manual
Doris Ling [Wed, 22 Mar 2017 23:49:17 +0000 (16:49 -0700)]
Split the plurals strings with zero quantity.
- plurals string with 0 quantity does not work as expect. Remove the
zero quantity string from the plurals string and put it as a separate
string instead.
Bug:
36376411
Test: builds
Change-Id: I5ee532b35969326b03d73edd28e4a213fa90f899
Doris Ling [Wed, 22 Mar 2017 21:45:43 +0000 (14:45 -0700)]
Update string for Do not disturb preference.
Bug:
34975939
Test: builds
Change-Id: I4567b9133deae1c52741d6f0d48d95be642bf2d2
TreeHugger Robot [Wed, 22 Mar 2017 23:34:23 +0000 (23:34 +0000)]
Merge "Update summary text for Wi-Fi hotspot"
TreeHugger Robot [Wed, 22 Mar 2017 23:16:05 +0000 (23:16 +0000)]
Merge "Add test config to SettingsUnitTests"
Daniel Nishi [Wed, 22 Mar 2017 23:12:55 +0000 (16:12 -0700)]
Update the system info dialog.
The string is updated as well as where the dialog shows up.
Change-Id: If1a3b17dca04fe81f52dbdc2353db34ce7adc49a
Fixes:
34857117
Test: Robotest
Fan Zhang [Wed, 22 Mar 2017 23:11:59 +0000 (16:11 -0700)]
Update string character limit
Change-Id: I6e31a7ca637c37d9bd3a99a078b62cba3d5a7b54
Fix:
36400209
Test: manual
Fan Zhang [Wed, 22 Mar 2017 22:14:47 +0000 (15:14 -0700)]
Convert BT preference to use TwoTargetPreference
Change-Id: I0b49af4afb4b782a6057060b2666f6528bc003b2
Fix:
36511169
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 22 Mar 2017 18:43:22 +0000 (11:43 -0700)]
Refactor the layout for MasterSwitch to a 2 target pref
And move the layout to settingslib.
The new TwoTargetPreference is a preference object that has a vertical
divider between main panel and widget (if it exists).
Converted master switch, restricted preference, gear preference to use
the new style
Change-Id: Ia3848cebb06b8edc4e60abf9b0caf13cdb29c22c
Fix:
36511169
Test: make RunSettingsRoboTests
Doris Ling [Wed, 22 Mar 2017 22:04:07 +0000 (15:04 -0700)]
Add summary text for wallpaper settings.
Bug:
34975969
Test: builds
Change-Id: If6e24aa45590b70aab16effec322cf7100cffb09
Doris Ling [Wed, 22 Mar 2017 21:56:41 +0000 (14:56 -0700)]
Update summary text for Wi-Fi hotspot
Bug:
36296257
Test: builds
Change-Id: Ib8d363ec23528bd2520509f6cefc5f49848cd3d5
Lei Yu [Wed, 22 Mar 2017 21:48:01 +0000 (21:48 +0000)]
Merge "Remove the hardcoded color in main page"
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
jackqdyulei [Wed, 22 Mar 2017 20:33:51 +0000 (13:33 -0700)]
Change dialog theme for dialog activity.
Before this cl, all dialog activities use theme
Theme.DeviceDefault.Light.Dialog.NoActionBar. In this cl
we change it to Theme.DeviceDefault.Settings.Dialog.NoActionBar
Bug:
36099867
Bug:
36295409
Test: Screenshot
Change-Id: I2328aad1dce636f2314538d548a49f7a6401eae5
TreeHugger Robot [Wed, 22 Mar 2017 20:59:23 +0000 (20:59 +0000)]
Merge "Use fragment context in AppHeaderController"