OSDN Git Service
Sunny Goyal [Tue, 14 Jun 2016 16:51:09 +0000 (16:51 +0000)]
Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev
Sunny Goyal [Mon, 13 Jun 2016 22:28:47 +0000 (15:28 -0700)]
Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.
Bug:
28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
Anna Galusza [Tue, 14 Jun 2016 16:09:23 +0000 (16:09 +0000)]
Merge "Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug:
29278252" into nyc-mr1-dev
Bill Yi [Tue, 14 Jun 2016 12:09:38 +0000 (12:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7221f5b6b4 -s ours
Change-Id: I638873a702599a87476abd1ef92734099dca3c76
TreeHugger Robot [Tue, 14 Jun 2016 12:04:54 +0000 (12:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:47:33 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 10:33:30 +0000 (03:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 10:17:02 +0000 (03:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
Julia Reynolds [Tue, 14 Jun 2016 01:57:37 +0000 (01:57 +0000)]
DND header should be translated.
am:
5a67d5f6f0
Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes:
29123731
TreeHugger Robot [Mon, 13 Jun 2016 22:01:45 +0000 (22:01 +0000)]
Merge "Added new setting for gestures." into nyc-mr1-dev
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev
Doris Ling [Tue, 24 May 2016 00:06:26 +0000 (17:06 -0700)]
Added new setting for gestures.
Added a new entry to the top level Settings' Device section to
enable/disable gestures.
Bug:
28565958
Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
Daniel Nishi [Fri, 10 Jun 2016 20:56:16 +0000 (13:56 -0700)]
Use Settings.Secure for days to retain.
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.
Bug:
28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
Michal Karpinski [Mon, 13 Jun 2016 17:40:13 +0000 (17:40 +0000)]
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am:
86c9894f04
Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
TreeHugger Robot [Mon, 13 Jun 2016 17:29:21 +0000 (17:29 +0000)]
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev
Robin Lee [Mon, 13 Jun 2016 16:15:20 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am:
cab4f9dc39
Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
Robin Lee [Mon, 13 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
Michal Karpinski [Mon, 13 Jun 2016 15:52:58 +0000 (16:52 +0100)]
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
Removing because user might not be able to remove (because the option is disallowed).
Bug:
29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
Robin Lee [Mon, 13 Jun 2016 13:19:44 +0000 (14:19 +0100)]
Respect DISALLOW_CONFIG_VPN for disconnect dialog
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix:
29265163
Nicolas Prevot [Mon, 13 Jun 2016 12:50:11 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am:
98704bc495
Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev
Bill Yi [Sat, 11 Jun 2016 04:40:07 +0000 (04:40 +0000)]
Import translations. DO NOT MERGE
am:
c66bffa31f -s ours
Change-Id: I8396507cd5e07b07539beef48ba50a175455478a
Anna Galusza [Thu, 9 Jun 2016 18:22:31 +0000 (11:22 -0700)]
Remove "Help & feedback" from toggle screen for accessibility services to
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug:
29278252
Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a
Bill Yi [Fri, 10 Jun 2016 20:49:23 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
Meng Wang [Fri, 10 Jun 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
Jason Monk [Fri, 10 Jun 2016 15:11:24 +0000 (15:11 +0000)]
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am:
1a1f6b0b1b
Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
TreeHugger Robot [Fri, 10 Jun 2016 15:06:34 +0000 (15:06 +0000)]
Merge "Fix crash in finish from onCreate." into nyc-dev
Jason Monk [Fri, 10 Jun 2016 13:49:12 +0000 (09:49 -0400)]
Fix crash in finish from onCreate.
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes:
29245324
Yohei Yukawa [Thu, 9 Jun 2016 23:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am:
294b1586ed
Change-Id: I66b2876c923eed55804e14edc9f73ad619157336
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev
Roozbeh Pournader [Thu, 9 Jun 2016 23:07:09 +0000 (23:07 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
Roozbeh Pournader [Thu, 9 Jun 2016 23:04:21 +0000 (23:04 +0000)]
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
Svet Ganov [Thu, 9 Jun 2016 22:53:40 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
Svetoslav Ganov [Thu, 9 Jun 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Don't send user to permissions screen if none requested" into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 22:01:52 +0000 (15:01 -0700)]
Fix sentence capitalization of locale names.
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.
With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item. It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.
This CL takes care of those UI elements in the Settings app. This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.
[1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
e489baf96df2837a3a63b626d9023a4a8b322c28
Bug:
29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
Roozbeh Pournader [Thu, 9 Jun 2016 04:55:09 +0000 (21:55 -0700)]
Use existing localizations for formatting data usage [DO NOT MERGE]
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug:
28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
Nicolas Prevot [Thu, 9 Jun 2016 10:27:57 +0000 (11:27 +0100)]
Fix rendering of policy transparency activity.
Use the dialog's context instead of the activity
context to inflate the view.
BUG:
29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446
Svet Ganov [Thu, 9 Jun 2016 05:32:07 +0000 (22:32 -0700)]
Don't send user to permissions screen if none requested
bug:
29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
b43b49c643 -s ours
Change-Id: Ia865b8f152d756c2180b15a2a9de0a667817ab62
Bill Yi [Thu, 9 Jun 2016 05:54:47 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80bce4c08874414f732d26ada50825c7b8140322
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Jun 2016 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
Doris Ling [Wed, 8 Jun 2016 21:35:19 +0000 (21:35 +0000)]
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)]
resolve merge conflicts of
7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
Jason Monk [Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Remove PreferenceActivity" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:51 +0000 (19:11 +0000)]
Merge "Fix data usage format strings" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
Doris Ling [Wed, 8 Jun 2016 00:56:00 +0000 (17:56 -0700)]
Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.
Bug:
28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
TreeHugger Robot [Wed, 8 Jun 2016 16:08:11 +0000 (16:08 +0000)]
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev
Felipe Leme [Wed, 11 May 2016 20:58:41 +0000 (13:58 -0700)]
Display total storage for Internal shared storage.
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG:
24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
** Cherrypicked from master - DO NOT MERGE **
Ricky Wai [Wed, 8 Jun 2016 14:49:06 +0000 (14:49 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am:
68c263cf2e
Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
Ricky Wai [Wed, 8 Jun 2016 14:34:02 +0000 (14:34 +0000)]
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
Jason Monk [Mon, 6 Jun 2016 20:01:58 +0000 (16:01 -0400)]
Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes:
28779941
Baligh Uddin [Wed, 8 Jun 2016 13:36:23 +0000 (13:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
09cedc44b4 -s ours
Change-Id: I1af6c2584397a29d5128eea7cdcfb8d8c9c8e0a7
Ricky Wai [Tue, 7 Jun 2016 15:54:25 +0000 (16:54 +0100)]
Make work challenge settings work even work profile is not enabled yet
Bug:
29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
Baligh Uddin [Wed, 8 Jun 2016 13:09:21 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 04:21:26 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
Jim Miller [Wed, 8 Jun 2016 00:38:29 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
f8c64089b1
Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
Jim Miller [Tue, 7 Jun 2016 22:44:46 +0000 (15:44 -0700)]
Move legacy full disk encryption code to Settings.
Fixes bug
27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
Jason Monk [Tue, 7 Jun 2016 18:02:33 +0000 (14:02 -0400)]
Fix disabling of tiles that are not relevant
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes:
29080209
TreeHugger Robot [Tue, 7 Jun 2016 03:35:54 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 7 Jun 2016 03:31:21 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
48229d7781 -s ours
* commit '
48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65
TreeHugger Robot [Tue, 7 Jun 2016 03:23:12 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:03:01 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
Bill Yi [Tue, 7 Jun 2016 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
Meng Wang [Fri, 3 Jun 2016 00:06:22 +0000 (17:06 -0700)]
Wi-Fi Calling settings UI update
Bug:
28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
Robin Lee [Mon, 6 Jun 2016 21:09:30 +0000 (21:09 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
am:
8f2c17e12c
* commit '
8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
Robin Lee [Mon, 6 Jun 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
Jason Monk [Mon, 6 Jun 2016 20:39:55 +0000 (16:39 -0400)]
Fix data usage format strings
Bug:
28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
Robin Lee [Mon, 23 May 2016 15:32:47 +0000 (16:32 +0100)]
Restrict Settings always-on to NYC+
Bug:
28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
Andrew Sapperstein [Fri, 3 Jun 2016 22:22:37 +0000 (22:22 +0000)]
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
Bill Yi [Fri, 3 Jun 2016 22:21:49 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
edafefc1ed -s ours
* commit '
edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
Jason Monk [Fri, 3 Jun 2016 22:21:47 +0000 (22:21 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
am:
8c5dccc6bf
* commit '
8c5dccc6bf05397cf4c51ce88d561fecbebba059':
Fix accidental non-translatable string
Change-Id: I71c42ccd2daca0801263809edb36eb4d175d444a
TreeHugger Robot [Fri, 3 Jun 2016 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 19:18:29 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Fri, 3 Jun 2016 19:12:09 +0000 (19:12 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
Jason Monk [Fri, 3 Jun 2016 19:06:56 +0000 (15:06 -0400)]
Fix accidental non-translatable string
Bug:
29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
Bill Yi [Fri, 3 Jun 2016 17:43:44 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief4e4adccef8f8a438e629d07e3129f3441293b6
Auto-generated-cl: translation import
Sudheer Shanka [Fri, 3 Jun 2016 17:14:43 +0000 (17:14 +0000)]
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
am:
a433fd2429
* commit '
a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
Avoid triggering device admin settings in non-current user.
Change-Id: I0557ea43f891a272f946987197bbb7df0aef9b0e
Bill Yi [Fri, 3 Jun 2016 17:09:43 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
Makoto Onuki [Fri, 3 Jun 2016 15:33:52 +0000 (15:33 +0000)]
Fix RTL layout
am:
3a87050921
* commit '
3a87050921f78e0882893bc343e49b8bb1b34975':
Fix RTL layout
Change-Id: Ia43ea6cb762de491564ed442d3751c2887d85735
Makoto Onuki [Fri, 3 Jun 2016 00:47:56 +0000 (17:47 -0700)]
Fix RTL layout
Bug
29072224
Change-Id: I414d868b4256e034850a873511bf34d9430842dc
Fyodor Kupolov [Thu, 2 Jun 2016 22:49:07 +0000 (22:49 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
am:
9121169dca
* commit '
9121169dca4bf3f11908031fd72448025d3933d4':
Make prefs without an action unselectable
Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e
Fyodor Kupolov [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
Andrew Sapperstein [Tue, 31 May 2016 17:34:01 +0000 (10:34 -0700)]
Add safety & regulatory info to "about device".
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".
The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.
BUG:
27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
Sudheer Shanka [Thu, 2 Jun 2016 19:40:22 +0000 (12:40 -0700)]
Avoid triggering device admin settings in non-current user.
Bug:
28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
Fyodor Kupolov [Thu, 2 Jun 2016 17:39:33 +0000 (10:39 -0700)]
Make prefs without an action unselectable
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug:
29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
Wei Wang [Thu, 2 Jun 2016 17:22:59 +0000 (17:22 +0000)]
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am:
d0d3ca3b7c
* commit '
d0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
Revert "Add an entry in developer options for location tools."
Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
Wei Wang [Thu, 2 Jun 2016 17:14:02 +0000 (17:14 +0000)]
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
Wei Wang [Thu, 2 Jun 2016 04:42:02 +0000 (04:42 +0000)]
Revert "Add an entry in developer options for location tools."
Bug:
28251942
This reverts commit
e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d.
Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
Jason Monk [Wed, 1 Jun 2016 20:20:01 +0000 (16:20 -0400)]
resolve merge conflicts of
67e87fa to nyc-mr1-dev
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
Jason Monk [Wed, 1 Jun 2016 20:09:00 +0000 (20:09 +0000)]
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
Sudheer Shanka [Wed, 1 Jun 2016 18:39:24 +0000 (18:39 +0000)]
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
am:
df66d4abf0
* commit '
df66d4abf0c994b5f53ec0978ba97e746852e3e9':
Start DeviceAdminSettings in a new task from support dialog.
Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d
TreeHugger Robot [Wed, 1 Jun 2016 18:16:21 +0000 (18:16 +0000)]
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:45:25 +0000 (13:45 -0400)]
onResume -> onStart, onPause -> onStop
For SettingsActivity and DashboardSummary
Bug:
28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
Jason Monk [Wed, 1 Jun 2016 17:39:13 +0000 (17:39 +0000)]
Merge "Fix some top-level settings not updating with language" into nyc-dev
am:
ed70356506
* commit '
ed703565063107350970959d82ac63eb76b51d26':
Fix some top-level settings not updating with language
Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c
Jason Monk [Wed, 1 Jun 2016 17:30:19 +0000 (17:30 +0000)]
Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
am:
9791704411
* commit '
979170441191f4c0fa292def1f2124bd62f70ffb':
Cache account prefs so we don't lose a11y focus
Change-Id: I475b564279160e4100008fb6affb48d1659de05f
Jason Monk [Wed, 1 Jun 2016 17:30:13 +0000 (17:30 +0000)]
Merge "Fix apps spinner jank." into nyc-dev
am:
ad302548ea
* commit '
ad302548ea5a030c2e44eb22a212285493037729':
Fix apps spinner jank.
Change-Id: I1867f2166dea86a9debd6f4304d6e43a8cbe32aa