OSDN Git Service
Julia Reynolds [Tue, 14 Jun 2016 22:30:33 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am:
b2301cb4c2
Change-Id: I43783338afaf01a3c22ab409a3c8836f6a36550f
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev
Sanket Padawe [Tue, 14 Jun 2016 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am:
fb87919fde
Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.
Bug:
29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
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: I2c5809787112d866890e24f35d315c2f944af610
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: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:58:02 +0000 (01:58 +0000)]
DND header should be translated.
am:
5a67d5f6f0
Change-Id: Ia9ce4e1465fa20a769b7f66e5cb1ae3577525875
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes:
29123731
Robert Greenwalt [Mon, 13 Jun 2016 20:01:36 +0000 (13:01 -0700)]
resolve merge conflicts of
b34cf86 to nyc-dev-plus-aosp
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
宋凯伦 [Mon, 13 Jun 2016 18:46:19 +0000 (18:46 +0000)]
Merge \"Fix the memory leak in TetherSettings\"
am:
03393c4109
Change-Id: Iec6e2b02efe28491c988a530f401350f8ee5b52f
Robert Greenwalt [Mon, 13 Jun 2016 18:35:31 +0000 (18:35 +0000)]
Merge "Fix the memory leak in TetherSettings"
Michal Karpinski [Mon, 13 Jun 2016 17:40:12 +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: Iee44fadb2563a162aa097bf101aea2045564277e
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
Julia Reynolds [Mon, 13 Jun 2016 16:49:45 +0000 (12:49 -0400)]
Prevent users from blocking system notifications.
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes:
29191134
Robin Lee [Mon, 13 Jun 2016 16:15:19 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am:
cab4f9dc39
Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377
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:16 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am:
98704bc495
Change-Id: I0b66044361c76629f20d2bb56ebb0779885a5781
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev
Ruchi Kandoi [Sat, 11 Jun 2016 05:04:52 +0000 (22:04 -0700)]
resolve merge conflicts of
9e28f9a to nyc-dev-plus-aosp
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
Bill Yi [Sat, 11 Jun 2016 04:40:07 +0000 (04:40 +0000)]
Import translations. DO NOT MERGE
am:
c66bffa31f -s ours
Change-Id: I6351c67c9f6f4882079b269134f7d61abe07da04
Mark Salyzyn [Fri, 10 Jun 2016 22:50:23 +0000 (22:50 +0000)]
Merge \"Settings: add logpersist selection (actions)\"
am:
3c398ea710
Change-Id: I49312b7af5d153ab37ad60a404db12a200fe5c42
Treehugger Robot [Fri, 10 Jun 2016 22:37:55 +0000 (22:37 +0000)]
Merge "Settings: add logpersist selection (actions)"
Mark Salyzyn [Fri, 3 Jun 2016 17:18:23 +0000 (10:18 -0700)]
Settings: add logpersist selection (actions)
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug:
28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
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
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: I8c4a6902f6fcf0510b2a307ca3fe7e918f9702f9
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: Id61473c100565d9d795bf314ccff6723bdd0c64c
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:06:55 +0000 (23:06 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
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:07 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
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
Mark Salyzyn [Thu, 9 Jun 2016 20:18:14 +0000 (20:18 +0000)]
Merge \\"Settings: add logpersist selection (strings)\\" am:
99afd4a87d
am:
540ebc39ac -s ours
Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142
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
Mark Salyzyn [Thu, 9 Jun 2016 19:46:46 +0000 (19:46 +0000)]
Merge \"Settings: add logpersist selection (strings)\"
am:
99afd4a87d
Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba
Mark Salyzyn [Thu, 9 Jun 2016 19:38:31 +0000 (19:38 +0000)]
Merge "Settings: add logpersist selection (strings)"
Mark Salyzyn [Fri, 3 Jun 2016 21:05:05 +0000 (14:05 -0700)]
Settings: add logpersist selection (strings)
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug:
28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
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: Ibb7f8a46f201ab267cbb1833608d10b4512babf2
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
Jason Monk [Wed, 8 Jun 2016 20:09:03 +0000 (16:09 -0400)]
Fix build
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit
e3ce6713d30e1fef2b081211af91d223c4c29692)
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Remove PreferenceActivity\" into nyc-dev
am:
7f7092c705
Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Fix data usage format strings\" into nyc-dev
am:
cb1972b908
Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
Jason Monk [Wed, 8 Jun 2016 19:15:41 +0000 (19:15 +0000)]
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
am:
9c5d3164f5
Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
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
Ricky Wai [Wed, 8 Jun 2016 14:47:43 +0000 (14:47 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am:
68c263cf2e
Change-Id: I40ee4bef616c6dbff872f5bb106b3195a9e5be07
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:05 +0000 (13:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
09cedc44b4 -s ours
Change-Id: I33f0f1c5bb67c375eac16b2619934c55dcabb504
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:35 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
f8c64089b1
Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd
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
Bill Yi [Tue, 7 Jun 2016 03:31:23 +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: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
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 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
Robin Lee [Mon, 6 Jun 2016 21:09:29 +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: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
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
Bill Yi [Fri, 3 Jun 2016 21:08:44 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
edafefc1ed -s ours
* commit '
edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I534c3d6e54efda539b6f246161f70328b5ff7916
Jason Monk [Fri, 3 Jun 2016 21:06:10 +0000 (21:06 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
am:
8c5dccc6bf
* commit '
8c5dccc6bf05397cf4c51ce88d561fecbebba059':
Fix accidental non-translatable string
Change-Id: I27dbea3833ed4e8c491a26da676da4b4e02696ca
TreeHugger Robot [Fri, 3 Jun 2016 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-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
Sanket Agarwal [Fri, 3 Jun 2016 18:01:45 +0000 (18:01 +0000)]
Merge "Handle return value when Bluetooth is enabled" am:
cc889f6b92
am:
e1fa67c165
* commit '
e1fa67c165ab7f1475ca4fc89be4e98dafa68a1d':
Handle return value when Bluetooth is enabled
Change-Id: I2446e2ab09eb061be09fafc73ed71e10dadd47ab
Sanket Agarwal [Fri, 3 Jun 2016 17:51:28 +0000 (17:51 +0000)]
Merge "Handle return value when Bluetooth is enabled"
am:
cc889f6b92
* commit '
cc889f6b9293cf9d9b693d721369f71aefeb1b6a':
Handle return value when Bluetooth is enabled
Change-Id: I5bda2e1e740846a3da07cec95987b7ec800221fd
Treehugger Robot [Fri, 3 Jun 2016 17:42:38 +0000 (17:42 +0000)]
Merge "Handle return value when Bluetooth is enabled"
Sudheer Shanka [Fri, 3 Jun 2016 17:13:09 +0000 (17:13 +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: Ica84a34db826fa02130aa85efff40544b246c3ef
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:57 +0000 (15:33 +0000)]
Fix RTL layout
am:
3a87050921
* commit '
3a87050921f78e0882893bc343e49b8bb1b34975':
Fix RTL layout
Change-Id: Ic758b78742843261a92f9f87bc2f602223955e8e
Sanket Agarwal [Wed, 27 Apr 2016 20:22:44 +0000 (13:22 -0700)]
Handle return value when Bluetooth is enabled
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/
28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
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:44:44 +0000 (22:44 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
am:
9121169dca
* commit '
9121169dca4bf3f11908031fd72448025d3933d4':
Make prefs without an action unselectable
Change-Id: I214ef870006bf5257ac3b51354ce20c429db3ea5
Fyodor Kupolov [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
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: I894e3bf6602adfb539b795e00f23d369dcb66251
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:32:26 +0000 (20:32 +0000)]
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
am:
67e87fa4e9
* commit '
67e87fa4e903306d4e430acd871dbad0c189b06b':
onResume -> onStart, onPause -> onStop
Change-Id: I1ca7fdc7246d40c82b3828b5d46762987a0d9a14
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:52 +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: I662b0b1b6f316564a3f9a318e558d02f3c8a96d0
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:37:13 +0000 (17:37 +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: I8f1e9c469f5e732d9f04a9b0060a30c5ffb55218
Jason Monk [Wed, 1 Jun 2016 17:37:12 +0000 (17:37 +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: I9076c38574c780a20cb98f74baa092824ec1c16f
Jason Monk [Wed, 1 Jun 2016 17:37:11 +0000 (17:37 +0000)]
Merge "Fix apps spinner jank." into nyc-dev
am:
ad302548ea
* commit '
ad302548ea5a030c2e44eb22a212285493037729':
Fix apps spinner jank.
Change-Id: I910f10090e2407c683435f7d3c4d20036c2465b5
OSDN Git Service
