OSDN Git Service
Abodunrinwa Toki [Thu, 5 May 2016 16:46:48 +0000 (16:46 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
am:
56f7bc44a1
* commit '
56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: Ib08f573cfaee03892e6366425ed0610286ee9445
Abodunrinwa Toki [Thu, 5 May 2016 16:40:57 +0000 (16:40 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev
am:
d1a4e452ed
* commit '
d1a4e452ed659f4f52b0b72f54da1100c6b1f512':
Don't crash on non-app data usage
Change-Id: I46b35f11555442c2b7e1301d1dec8ee95807f36c
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
am:
2a6bc40d49
* commit '
2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
Fix cell data limit dialog title
Change-Id: Ia087f0ace8cb1f9a3c93ced1b3500207b6d63cf4
Jason Monk [Thu, 5 May 2016 15:41:17 +0000 (15:41 +0000)]
Merge "Don't crash on non-app data usage" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:40:50 +0000 (15:40 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: Ifeee1ee85084aa668ca3f7083db80cdf4da3beb9
Tony Mak [Thu, 5 May 2016 13:50:09 +0000 (13:50 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
Abodunrinwa Toki [Fri, 22 Apr 2016 16:45:03 +0000 (17:45 +0100)]
InputSettings: Define order of items in Physical keyboards screen.
Bug:
28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
Jason Monk [Wed, 4 May 2016 19:46:05 +0000 (15:46 -0400)]
Fix cell data limit dialog title
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes:
27604216
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: Ibca759a4db12c5edb913711344a860cff75022ee
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:58:17 +0000 (18:58 +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: I843e1e6da26237465dd054267a1031d7e38bdbc0
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
Jason Monk [Wed, 4 May 2016 17:43:26 +0000 (13:43 -0400)]
Don't crash on non-app data usage
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes:
28531037
Jeff Sharkey [Wed, 4 May 2016 17:34:55 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
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
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: I38dce28a33ac847cba1f256d99ec2a0f092d5b4c
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:44 +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: Ieacd13cc6536fd789b76246de550c4592cfe4b57
Tony Mak [Wed, 4 May 2016 12:51:41 +0000 (13:51 +0100)]
Should forward the intent even if its activity is disabled in Settings
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.
Bug:
28426865
Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
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 09:41:58 +0000 (09:41 +0000)]
Merge "Add managed profile setting page" into nyc-dev
am:
d5b3a5d342
* commit '
d5b3a5d342d74411b0e4466541d5c5b1168eb803':
Add managed profile setting page
Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c
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:42 +0000 (00:23 +0000)]
Import translations. DO NOT MERGE
am:
61e99fed5b -s ours
* commit '
61e99fed5bf1791f0cc73199f8d99d9519a9f811':
Import translations. DO NOT MERGE
Change-Id: Ic97822a7035c3c0ec954714c304ea1b4461ad094
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
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: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
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:05 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I641c41d7833bb8104f722889c123d1fe2447f6e7
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:18 +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: Idd3946011f5f516c444973ce0f06381efe44cda9
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
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:06 +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: Ia280336dd979aee7c6faf76fc77bef275f2b6285
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: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: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
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:59 +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: I348e39f6519c3d620b7f3a3cba6eca72118339a9
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:27 +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: I0b92a87785df54ca66427a4e3871f0ed4737b55f
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
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: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
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: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]
Merge "Don't crash on Settings data usage" into nyc-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:27 +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: Id336b4dcf1ab7fce3581286d598cf590c4973548
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: Ie565b3a9d7d7caa00d8be389774b397339fec1b9
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:38:56 +0000 (17:38 +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: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
Clara Bayarri [Fri, 29 Apr 2016 17:28:42 +0000 (17:28 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
Clara Bayarri [Fri, 29 Apr 2016 16:46:27 +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: I178049719bc00f5baddce247c257004ec41fcbbe
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
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: Icb2585bb7619e9bac4592f904b8978b8668ba4ff
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: I0b55dd38a001726331012df441de34ba998c512f
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:50 +0000 (23:21 +0000)]
Handling of issues while migrating primary storage
am:
1ec941db0c
* commit '
1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
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
Julia Reynolds [Thu, 28 Apr 2016 19:35:28 +0000 (19:35 +0000)]
Expand BT screen.
am:
05c6a2c007
* commit '
05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893
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: Ic66ba905b1f225bbfaff6db51164727a21599238
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: I5e393db4d91a59b491077ede1563bc0fe036a023
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: Id7db30f04e32d212fa1edc719ad0363e468bec67
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:17 +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: I5af67764994e4cfed9f8ef4243954260d48ae163
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 23:45:11 +0000 (23:45 +0000)]
Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am:
aee8d8c
* commit '
aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
Fix crash when recreating SecuritySubSettings
Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87
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:51 +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: I5a8bce52f789a274ca1fc7cff1fb130072f9e0c4
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
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
Bill Yi [Wed, 27 Apr 2016 19:56:10 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
eb50d20 -s ours
* commit '
eb50d20504dc31e562f6687298de3aca7d011896':
Import translations. DO NOT MERGE
Change-Id: Ic9e597c9fe422865b44113e31f0e49567f0f37e4
Bill Yi [Wed, 27 Apr 2016 19:44:12 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Felipe Leme [Tue, 26 Apr 2016 20:50:14 +0000 (13:50 -0700)]
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
BUG:
26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
Clara Bayarri [Wed, 27 Apr 2016 19:26:52 +0000 (19:26 +0000)]
Merge "Fix Settings Condition expand button a11y label" into nyc-dev
am:
51b1e05
* commit '
51b1e0515d64adf3e330437960546465c0f4c7d3':
Fix Settings Condition expand button a11y label
Change-Id: I5891f817f4f484c79968c9ea8300596b5c1652d1
Jason Monk [Wed, 27 Apr 2016 19:15:59 +0000 (19:15 +0000)]
Merge "Fix Settings Condition expand button a11y label" into nyc-dev