OSDN Git Service
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Icb3b9ca85af76635eb64a60a45cd91fc13ab7bb1
Philip P. Moltmann [Wed, 4 May 2016 19:08:48 +0000 (19:08 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
Robin Lee [Wed, 4 May 2016 18:54:52 +0000 (18:54 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I0730abfe3c7cbec60f3961f5c9d8e111c2e8a5ac
Robin Lee [Wed, 4 May 2016 18:38:28 +0000 (18:38 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Fan Zhang [Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
Jeff Sharkey [Wed, 4 May 2016 17:34:56 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
TreeHugger Robot [Wed, 4 May 2016 17:13:16 +0000 (17:13 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 16:44:01 +0000 (09:44 -0700)]
Do not set order for print services settings.
What happened before was that negative number turned out to be order
behind ORDER_LAST.
Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
Daniel Nishi [Wed, 4 May 2016 16:13:24 +0000 (16:13 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
Fan Zhang [Thu, 28 Apr 2016 22:20:09 +0000 (15:20 -0700)]
Bring escalation options UI closer to mock.
Bug:
28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
Mahaver Chopra [Wed, 4 May 2016 14:03:08 +0000 (14:03 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
Nicolas Prevot [Wed, 4 May 2016 12:53:36 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
Nicolas Prévot [Wed, 4 May 2016 12:43:31 +0000 (12:43 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
Mahaver Chopra [Wed, 4 May 2016 12:11:17 +0000 (13:11 +0100)]
More informative title while choosing work lock.
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".
Bug:
28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
Nicolas Prevot [Thu, 21 Apr 2016 11:26:48 +0000 (12:26 +0100)]
Only ask for credentials in add account if user is locked.
Also: if work mode is off, ask to turn work on before adding
a work account.
BUG:
28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
Tony Mak [Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)]
resolve merge conflicts of
d5b3a5d to nyc-mr1-dev
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
Tony Mak [Wed, 4 May 2016 09:33:24 +0000 (09:33 +0000)]
Merge "Add managed profile setting page" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 00:23:48 +0000 (00:23 +0000)]
Import translations. DO NOT MERGE
am:
61e99fed5b -s ours
* commit '
61e99fed5bf1791f0cc73199f8d99d9519a9f811':
Import translations. DO NOT MERGE
Change-Id: I6f32a88ec655e494347168c37cb0ecba7ebea8ba
Daniel Nishi [Wed, 4 May 2016 00:21:51 +0000 (17:21 -0700)]
Fix a bug where negative file sizes were being used.
Negative file sizes for packages occurs when the file size is either
unknown or if an error occurred during size calculation. As a result,
we can skip them for total freeable space calculations.
Bug:
28465884
Change-Id: I340d725a66a228fd94993781c5e8ef732a60a7b3
Baligh Uddin [Wed, 4 May 2016 00:00:33 +0000 (17:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
Jeff Sharkey [Tue, 3 May 2016 23:25:37 +0000 (17:25 -0600)]
UX polish tweaks to FallbackHome.
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug:
28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
TreeHugger Robot [Tue, 3 May 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
Jason Monk [Tue, 3 May 2016 19:39:59 +0000 (19:39 +0000)]
Merge "Fix leaks" into nyc-dev
am:
ea8ee68507
* commit '
ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
Fix leaks
Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
Jason Monk [Tue, 3 May 2016 19:36:34 +0000 (19:36 +0000)]
Merge "Fix leaks" into nyc-dev
Jason Monk [Tue, 3 May 2016 19:24:05 +0000 (15:24 -0400)]
Fix leaks
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes:
28074995
Jason Monk [Tue, 3 May 2016 18:42:10 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
Jason Monk [Tue, 3 May 2016 18:37:23 +0000 (18:37 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
Michael Wright [Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
am:
12c2c2538b
* commit '
12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
Michael Wright [Tue, 3 May 2016 18:28:59 +0000 (18:28 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
Michael Wright [Tue, 3 May 2016 13:32:32 +0000 (14:32 +0100)]
Add subtext for default keyboard layout.
Bug:
27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
Jason Monk [Tue, 3 May 2016 18:25:56 +0000 (14:25 -0400)]
Try to fix receiver crash
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes:
28554650
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG:
28381984
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
Tony Mak [Tue, 3 May 2016 17:55:41 +0000 (18:55 +0100)]
Add managed profile setting page
Bug:
28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
Baligh Uddin [Tue, 3 May 2016 16:49:04 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6a875576f -s ours
* commit '
e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
Baligh Uddin [Tue, 3 May 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Tue, 3 May 2016 16:41:17 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robin Lee [Tue, 3 May 2016 12:27:05 +0000 (13:27 +0100)]
Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.
Bug:
26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
Baligh Uddin [Tue, 3 May 2016 08:39:46 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 May 2016 08:25:52 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
Philip P. Moltmann [Mon, 2 May 2016 23:24:05 +0000 (23:24 +0000)]
Merge "Read disk ID from intent" into nyc-dev
am:
e0e7fa4501
* commit '
e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent
Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
Philip P. Moltmann [Mon, 2 May 2016 23:00:30 +0000 (23:00 +0000)]
Merge "Read disk ID from intent" into nyc-dev
Sudheer Shanka [Mon, 2 May 2016 20:09:58 +0000 (20:09 +0000)]
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
am:
57e6a9144a
* commit '
57e6a9144a0577308bd9888f3498c17ca96e4f5f':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
Change-Id: I078516706896910eeee3e86b525e96cdf807aa1b
Sudheer Shanka [Mon, 2 May 2016 20:00:45 +0000 (20:00 +0000)]
Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev
Maurice Lam [Mon, 2 May 2016 18:05:23 +0000 (18:05 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev
am:
0e4816efb9
* commit '
0e4816efb99e28a25efecee1702c552bfb9ba849':
Remove top padding only if illustration is present
Change-Id: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
Maurice Lam [Mon, 2 May 2016 17:58:10 +0000 (17:58 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev
Fan Zhang [Mon, 2 May 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev
Fan Zhang [Fri, 29 Apr 2016 20:05:49 +0000 (13:05 -0700)]
Explicitly setAccount in the same way as setHasInternet.
Bug:
28141203
This frees adapter from updating account and internet internally, and
allows refreshData() be private.
Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
Adrian Roos [Mon, 2 May 2016 15:21:02 +0000 (15:21 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
am:
820d7c85c7
* commit '
820d7c85c724b28267b1a5d0dee8b190f49d8517':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
Adrian Roos [Mon, 2 May 2016 15:13:40 +0000 (15:13 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
Philip P. Moltmann [Fri, 29 Apr 2016 23:35:28 +0000 (16:35 -0700)]
Read disk ID from intent
mDisk might be null, but we can recover the disk ID from the original
Intent.
Bug:
28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
Maurice Lam [Fri, 29 Apr 2016 22:07:40 +0000 (15:07 -0700)]
Remove top padding only if illustration is present
Bug:
28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
Adrian Roos [Fri, 29 Apr 2016 21:37:02 +0000 (14:37 -0700)]
Properly handle rotation in NotificationLockscreenPreference
There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.
Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes:
27921546
Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]
Merge "Don\'t crash on Settings data usage" into nyc-dev
am:
b60c7560af
* commit '
b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage
Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7
Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]
Merge "Don't crash on Settings data usage" into nyc-dev
Fan Zhang [Fri, 29 Apr 2016 18:20:50 +0000 (18:20 +0000)]
Merge "Disable stable id in support adapter." into nyc-mr1-dev
Jason Monk [Fri, 29 Apr 2016 18:06:10 +0000 (14:06 -0400)]
Don't crash on Settings data usage
Consider Settings uid (SYSTEM_UID) to be an app.
Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes:
28193076
Jason Monk [Fri, 29 Apr 2016 17:57:24 +0000 (17:57 +0000)]
Merge "Don\'t crash settings when out of space." into nyc-dev
am:
a1fe122b99
* commit '
a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.
Change-Id: Ie1095da87343cc74d65bbcf255d5692197a7a241
Jason Monk [Fri, 29 Apr 2016 17:54:33 +0000 (17:54 +0000)]
Merge "Don't crash settings when out of space." into nyc-dev
Jason Monk [Fri, 29 Apr 2016 17:51:08 +0000 (13:51 -0400)]
Don't crash settings when out of space.
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes:
28198128
Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am:
7dce005fab
* commit '
7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update
Change-Id: Ia6218cfbd9d2b0d29e36def684f5909932980481
Mihai Niță [Fri, 29 Apr 2016 17:46:16 +0000 (17:46 +0000)]
Merge "Fix: accessibility actions move languages but don't update" into nyc-dev
Clara Bayarri [Fri, 29 Apr 2016 17:39:05 +0000 (17:39 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am:
35bf932eb0
* commit '
35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
Clara Bayarri [Fri, 29 Apr 2016 17:28:42 +0000 (17:28 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
Fan Zhang [Fri, 29 Apr 2016 17:23:21 +0000 (10:23 -0700)]
Disable stable id in support adapter.
Bug:
28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692
Clara Bayarri [Fri, 29 Apr 2016 16:46:28 +0000 (16:46 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am:
d2549ce663
* commit '
d2549ce6635943144bde17582b825113c07aa868':
Storage Settings shows hamburger instead of back arrow
Change-Id: Icc2014157f5160968563fdbaab175cbd90a76d58
Clara Bayarri [Fri, 29 Apr 2016 16:38:11 +0000 (16:38 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
Clara Bayarri [Fri, 29 Apr 2016 15:58:09 +0000 (16:58 +0100)]
Storage Settings shows hamburger instead of back arrow
When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.
Bug:
28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85
Fan Zhang [Fri, 29 Apr 2016 15:49:30 +0000 (15:49 +0000)]
Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
Julia Reynolds [Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)]
Merge "Fix NPE in user settings." into nyc-dev
am:
e69d754865
* commit '
e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.
Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933
Julia Reynolds [Fri, 29 Apr 2016 14:29:18 +0000 (14:29 +0000)]
Merge "Fix NPE in user settings." into nyc-dev
shwetachahar [Fri, 29 Apr 2016 13:34:19 +0000 (13:34 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
am:
19c01f0351
* commit '
19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: If4a777002972d217fbd770c0b2f481a9934bfd41
Shweta Chahar [Fri, 29 Apr 2016 13:29:10 +0000 (13:29 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
Julia Reynolds [Fri, 29 Apr 2016 12:42:01 +0000 (08:42 -0400)]
Fix NPE in user settings.
Bug:
28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
Philip P. Moltmann [Thu, 28 Apr 2016 23:21:48 +0000 (23:21 +0000)]
Handling of issues while migrating primary storage
am:
1ec941db0c
* commit '
1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
Philip P. Moltmann [Thu, 21 Apr 2016 17:45:39 +0000 (10:45 -0700)]
Handling of issues while migrating primary storage
Bug:
28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
Fan Zhang [Tue, 26 Apr 2016 22:05:04 +0000 (15:05 -0700)]
Prompt sign-in when there is no account for support options
Bug:
28141203
Bug:
28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
Julia Reynolds [Thu, 28 Apr 2016 19:24:51 +0000 (19:24 +0000)]
Expand BT screen.
am:
05c6a2c007
* commit '
05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd
Julia Reynolds [Thu, 28 Apr 2016 13:41:25 +0000 (09:41 -0400)]
Expand BT screen.
Bug:
27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
shwetachahar [Thu, 28 Apr 2016 15:05:55 +0000 (16:05 +0100)]
Set the max for pitch seekbar in xml in sync with the max for pitch
seekbar in TextToSpeechSettings.java
Bug:
28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
Jason Monk [Thu, 28 Apr 2016 14:58:11 +0000 (14:58 +0000)]
Merge "Fix summary lifecycle" into nyc-dev
am:
6e51591
* commit '
6e5159185388ed97c5b1a8648c1c6f2396d124a2':
Fix summary lifecycle
Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f
Jason Monk [Thu, 28 Apr 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Fix summary lifecycle" into nyc-dev
Jason Monk [Thu, 28 Apr 2016 14:42:10 +0000 (10:42 -0400)]
Fix summary lifecycle
Once more and probably not for all
Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening. Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.
Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes:
28319383
Jason Monk [Thu, 28 Apr 2016 14:17:28 +0000 (14:17 +0000)]
Merge "Fix search after upgrade" into nyc-dev
am:
f96b594
* commit '
f96b5947f9122e471d7cc72847f707bc4dcc30a4':
Fix search after upgrade
Change-Id: Iba0908e1a338fc4feea5ce6c7fbbe5847cd16dcb
Jason Monk [Thu, 28 Apr 2016 14:13:44 +0000 (14:13 +0000)]
Merge "Fix search after upgrade" into nyc-dev
Jason Monk [Thu, 28 Apr 2016 14:07:28 +0000 (10:07 -0400)]
Fix search after upgrade
Settings was dropping the search tables after upgrade but not
clearing the bit that says a full index has completed.
Change-Id: If49960b8cc07e72127bac211ae4d6c1f25b71c81
Fixes:
28414461
Jason Monk [Thu, 28 Apr 2016 12:59:34 +0000 (12:59 +0000)]
Merge "Default payment settings to disabled" into nyc-dev
am:
6b421dd
* commit '
6b421dd4f6250bceba673d6f86dcb48026517b01':
Default payment settings to disabled
Change-Id: Ibff8616f8b6313843c28903ee2e38dce3462f076
Jason Monk [Thu, 28 Apr 2016 12:56:46 +0000 (12:56 +0000)]
Merge "Default payment settings to disabled" into nyc-dev
Wei Wang [Thu, 28 Apr 2016 06:03:16 +0000 (06:03 +0000)]
Merge "Add an entry in developer options for location tools." into nyc-dev
am:
920cf0a
* commit '
920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
Add an entry in developer options for location tools.
Change-Id: Ie48ad7a27367353e50d0dc021c2f36eebf04af77
Wei Wang [Thu, 28 Apr 2016 05:57:30 +0000 (05:57 +0000)]
Merge "Add an entry in developer options for location tools." into nyc-dev
Adrian Roos [Wed, 27 Apr 2016 22:52:56 +0000 (22:52 +0000)]
Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am:
aee8d8c
* commit '
aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
Fix crash when recreating SecuritySubSettings
Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98
Wei Wang [Tue, 26 Apr 2016 04:52:03 +0000 (21:52 -0700)]
Add an entry in developer options for location tools.
This is a temporary place holder for location dogfood tools, which will
be removed before ship.
Bug:
28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
TreeHugger Robot [Wed, 27 Apr 2016 22:40:05 +0000 (22:40 +0000)]
Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
Felipe Leme [Wed, 27 Apr 2016 21:31:53 +0000 (21:31 +0000)]
Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
am:
a21ac18
* commit '
a21ac18b05c95b413dfc8b279e9c3841b412b24c':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
Change-Id: If77ecd7bc909fcd7af17a02aaa99061e4f242cad
TreeHugger Robot [Wed, 27 Apr 2016 21:15:58 +0000 (21:15 +0000)]
Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
Adrian Roos [Wed, 27 Apr 2016 20:58:22 +0000 (13:58 -0700)]
Fix crash when recreating SecuritySubSettings
Restoring instance state requires the items to be
there after onCreate.
Change-Id: Icef92bcbb168a0b4029a86b2b74235e344e2055e
Fixes:
27013071
Fan Zhang [Wed, 27 Apr 2016 20:42:38 +0000 (20:42 +0000)]
Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev
Jason Monk [Wed, 27 Apr 2016 20:33:39 +0000 (16:33 -0400)]
Default payment settings to disabled
Since it requires some hardware to be enabled.
Change-Id: I6d2a244211cb4c1fa7aadb76e5c2e4ff7459bcc4
Fixes:
28326451
Daniel Nishi [Wed, 27 Apr 2016 20:31:57 +0000 (20:31 +0000)]
Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev
Daniel Nishi [Tue, 26 Apr 2016 23:05:20 +0000 (16:05 -0700)]
Fix a Deletion Helper crash when it fails to get an app list.
Bug
28424827
Change-Id: I5c3c426d557fb1647a3909bf88fbb7d24329dc57
OSDN Git Service
