OSDN Git Service
Yohei Yukawa [Thu, 16 Jun 2016 21:47:02 +0000 (21:47 +0000)]
Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am:
db6f1f2cb5
am:
cfe0f07499
Change-Id: I0b6538c6017d84591bce7a139e3423bcdd8f7d0a
Yohei Yukawa [Thu, 16 Jun 2016 21:40:53 +0000 (21:40 +0000)]
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
am:
db6f1f2cb5
Change-Id: Ie23d6efbd6c751f6f1cd7701754dbad61375f8bd
Yohei Yukawa [Thu, 16 Jun 2016 21:24:04 +0000 (21:24 +0000)]
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
Doris Ling [Thu, 16 Jun 2016 19:07:03 +0000 (19:07 +0000)]
Merge \"Update gesture related settings in Display.\" into nyc-mr1-dev
am:
600a1eeec5
Change-Id: I817d2e43f391b4e1f097c7509bd220041b0c18d5
Doris Ling [Thu, 16 Jun 2016 18:52:30 +0000 (18:52 +0000)]
Merge "Update gesture related settings in Display." into nyc-mr1-dev
Doris Ling [Tue, 14 Jun 2016 18:21:57 +0000 (11:21 -0700)]
Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.
Bug:
28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
Bill Yi [Thu, 16 Jun 2016 10:39:29 +0000 (10:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
96e8845438 -s ours
Change-Id: I6d3a28c98d78beb2739fec3826297ee9ad524e27
TreeHugger Robot [Thu, 16 Jun 2016 10:35:08 +0000 (10:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:34:19 +0000 (10:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
32b427b137 -s ours
am:
fbd0f53df1 -s ours
Change-Id: Iffc95969f3255b2aa5e9c70aec9c6f69ef00ff79
Bill Yi [Thu, 16 Jun 2016 10:32:03 +0000 (10:32 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
32b427b137 -s ours
am:
748841c8de -s ours
Change-Id: Ib882d7c1073219233d5083219ed8e01c4927a7fe
Bill Yi [Thu, 16 Jun 2016 10:28:56 +0000 (10:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
32b427b137 -s ours
Change-Id: I6785959fc5131f6cde32be0b960b26015fdc74c5
Bill Yi [Thu, 16 Jun 2016 10:28:56 +0000 (10:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
32b427b137 -s ours
Change-Id: I829656295916ec3bbd89ff9ca71dad569beca264
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 09:03:59 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 08:52:41 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
Yohei Yukawa [Thu, 16 Jun 2016 07:02:01 +0000 (00:02 -0700)]
Teach hard keyboard settings about correct user ID
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.
Bug:
29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
Android Build Merger (Role) [Thu, 16 Jun 2016 02:02:05 +0000 (02:02 +0000)]
Merge "BidiFormat adapter name for bluetooth_is_visible_message am:
77893a4c4b am:
20d6b425c5" into nyc-mr1-dev-plus-aosp
Roozbeh Pournader [Thu, 16 Jun 2016 02:01:55 +0000 (02:01 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message am:
77893a4c4b
am:
7d9cdfd4b6
Change-Id: I9833706a1048ae3ecd703ae221c510ed9700b503
Roozbeh Pournader [Thu, 16 Jun 2016 02:01:53 +0000 (02:01 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message am:
77893a4c4b
am:
20d6b425c5
Change-Id: I828c921cc0a128dd2c7f612d3dad098ba747d5a0
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:37 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am:
77893a4c4b
Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:22 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am:
77893a4c4b
Change-Id: I015d588d17dbd767d528d986d0a784c361889edc
Daniel Nishi [Wed, 15 Jun 2016 22:19:34 +0000 (22:19 +0000)]
Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
am:
3d040e55d9
Change-Id: I2adbcb4260adc1719549ac4e26700a6dc099481e
Daniel Nishi [Wed, 15 Jun 2016 22:14:08 +0000 (22:14 +0000)]
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
Roozbeh Pournader [Wed, 15 Jun 2016 21:37:30 +0000 (14:37 -0700)]
BidiFormat adapter name for bluetooth_is_visible_message
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.
With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.
Bug:
28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
Android Build Merger (Role) [Wed, 15 Jun 2016 18:22:33 +0000 (18:22 +0000)]
Merge "Merge \\"log as counters instead of histograms\\" into nyc-dev am:
6913b6118f am:
420d46ee68" into nyc-mr1-dev-plus-aosp
Chris Wren [Wed, 15 Jun 2016 18:22:25 +0000 (18:22 +0000)]
Merge \\"log as counters instead of histograms\\" into nyc-dev am:
6913b6118f
am:
420d46ee68
Change-Id: Ie3463a5f54e7105ccfe157009d3216e5799412bd
Chris Wren [Wed, 15 Jun 2016 18:22:17 +0000 (18:22 +0000)]
Merge \\"log as counters instead of histograms\\" into nyc-dev am:
6913b6118f
am:
0a13cfbf8e
Change-Id: Idd702a08ce45c528cf91b0b79ce8249432dc3cca
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am:
6913b6118f
Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am:
6913b6118f
Change-Id: I1f63c363b2980682dd61e863d94b71aeca3048b5
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev
Daniel Nishi [Tue, 14 Jun 2016 00:37:06 +0000 (17:37 -0700)]
Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.
Bug:
29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
Maurice Lam [Wed, 15 Jun 2016 17:59:24 +0000 (17:59 +0000)]
Merge \"Update UI style for GLIF buttons\" into nyc-mr1-dev
am:
a028010c23
Change-Id: Ic19e5d4909fbd7c2d7841e12cfec29b264d144a6
Maurice Lam [Wed, 15 Jun 2016 17:59:20 +0000 (17:59 +0000)]
Merge \"Fingerprint string updates\" into nyc-mr1-dev
am:
e33872772c
Change-Id: I9e330926b8160d434605233d5b8c50a0026ebad3
Maurice Lam [Wed, 15 Jun 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 17:07:30 +0000 (17:07 +0000)]
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am:
b53117f55c
am:
2f4c80f3c7
Change-Id: I4332b2af62ab8e416136302a4d4b2582a0ae5e54
Maurice Lam [Wed, 15 Jun 2016 17:07:27 +0000 (17:07 +0000)]
Merge "Fingerprint string updates" into nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 16:59:09 +0000 (16:59 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am:
b53117f55c
Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
Jason Monk [Wed, 15 Jun 2016 16:58:59 +0000 (16:58 +0000)]
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am:
b53117f55c
am:
e3eaa08742
Change-Id: I891dcc41ec37a1de641beeb3690695fdab385e66
Jason Monk [Wed, 15 Jun 2016 16:53:55 +0000 (16:53 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am:
b53117f55c
Change-Id: I8214420cb1a2c7f9d462650908c1546adcc3b950
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
Ricky Wai [Wed, 15 Jun 2016 16:42:45 +0000 (16:42 +0000)]
Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am:
42cbbc3052
am:
0f747c979d
Change-Id: I71dbdaa0d7ee011398987f9a86338b584938391d
Jason Monk [Wed, 15 Jun 2016 16:42:45 +0000 (16:42 +0000)]
Merge \\"Make linkify handle emptys urls better DO NOT MERGE\\" into nyc-dev am:
f4ad4434f1
am:
4904ba543e
Change-Id: I478b632a2cf7990b15791def468bf981593ca79c
Ricky Wai [Wed, 15 Jun 2016 16:42:05 +0000 (16:42 +0000)]
Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am:
42cbbc3052
am:
5ec65517a6
Change-Id: Iaf25d93b2926b985d8cad2c9e9923c819486d21e
Jason Monk [Wed, 15 Jun 2016 16:42:04 +0000 (16:42 +0000)]
Merge \"resolve merge conflicts of
f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev
am:
b2e2007766
Change-Id: I1c135d7ff2977d5f5f5855e8fa7649303deef565
Ricky Wai [Wed, 15 Jun 2016 16:38:28 +0000 (16:38 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am:
42cbbc3052
Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31
Jason Monk [Wed, 15 Jun 2016 16:37:16 +0000 (16:37 +0000)]
Merge "resolve merge conflicts of
f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
Chris Wren [Wed, 15 Jun 2016 15:44:16 +0000 (11:44 -0400)]
log as counters instead of histograms
this will interoperate better with UMA
Bug:
26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
Fan Zhang [Wed, 15 Jun 2016 16:17:20 +0000 (16:17 +0000)]
Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
am:
1c6674dbb2
Change-Id: I35349cfef2f68057dbd80ea04a8851f5fc54860a
Fan Zhang [Wed, 15 Jun 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove forum link from support tab." into nyc-mr1-dev
Ricky Wai [Wed, 15 Jun 2016 16:04:41 +0000 (16:04 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am:
42cbbc3052
Change-Id: I736dcaa1c92c0557559719054f0177eb9cf1fc24
Ricky Wai [Wed, 15 Jun 2016 16:02:18 +0000 (16:02 +0000)]
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 15:31:14 +0000 (11:31 -0400)]
resolve merge conflicts of
f4ad443 to nyc-mr1-dev
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
Jason Monk [Wed, 15 Jun 2016 15:03:26 +0000 (15:03 +0000)]
Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
am:
f4ad4434f1
Change-Id: Ic52d42c920c29942dbcca880fa70bdde69cb1960
Jason Monk [Wed, 15 Jun 2016 14:23:18 +0000 (10:23 -0400)]
Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.
Also return the right view in onCreateView
Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes:
29335528
Jason Monk [Wed, 15 Jun 2016 14:53:43 +0000 (14:53 +0000)]
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
Maurice Lam [Wed, 15 Jun 2016 02:14:37 +0000 (19:14 -0700)]
Fingerprint string updates
Bug:
29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
Maurice Lam [Wed, 15 Jun 2016 01:35:37 +0000 (18:35 -0700)]
Update UI style for GLIF buttons
Bug:
29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
Julia Reynolds [Tue, 14 Jun 2016 22:33:55 +0000 (22:33 +0000)]
Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am:
b2301cb4c2
am:
7803e3f76b
Change-Id: I37cdd1d3c124c7e639958e482e88f52f78c405ba
Julia Reynolds [Tue, 14 Jun 2016 22:33:34 +0000 (22:33 +0000)]
Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am:
b2301cb4c2
am:
f04499b2e1
Change-Id: I9253ee4788f3e3bf6918a98fc2a2c4927d920114
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
Julia Reynolds [Tue, 14 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am:
b2301cb4c2
Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev
Fan Zhang [Tue, 14 Jun 2016 22:10:47 +0000 (22:10 +0000)]
Align text for conditions with text for other tiles.
am:
cf605973b2
Change-Id: I1b978a1a6229017160840d87e6798b5218382eb3
Fan Zhang [Tue, 14 Jun 2016 20:01:45 +0000 (13:01 -0700)]
Remove forum link from support tab.
Bug:
29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
Fan Zhang [Tue, 14 Jun 2016 19:44:48 +0000 (12:44 -0700)]
Align text for conditions with text for other tiles.
Bug:
29107343
Text should be 72dp from left of screen, not 76dp.
Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f
Fan Zhang [Tue, 14 Jun 2016 19:31:15 +0000 (19:31 +0000)]
Merge \"Support tab UI polish.\" into nyc-mr1-dev
am:
cac9227e16
Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9
Fan Zhang [Tue, 14 Jun 2016 19:26:28 +0000 (19:26 +0000)]
Merge "Support tab UI polish." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Jun 2016 18:07:23 +0000 (18:07 +0000)]
Merge "Fix bug in Sim Status Settings. am:
fb87919fde am:
be5fbd9954" into nyc-mr1-dev-plus-aosp
Sanket Padawe [Tue, 14 Jun 2016 18:07:13 +0000 (18:07 +0000)]
Fix bug in Sim Status Settings. am:
fb87919fde
am:
8b1acb7973
Change-Id: I8d8c7ef15e81530ce21849eb2ff034ea10b2ea13
Sanket Padawe [Tue, 14 Jun 2016 18:07:12 +0000 (18:07 +0000)]
Fix bug in Sim Status Settings. am:
fb87919fde
am:
be5fbd9954
Change-Id: Ib6d2df9f2374943a93d0e7dd0ee2cb1d405f9a13
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 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am:
fb87919fde
Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
Fan Zhang [Mon, 13 Jun 2016 20:50:13 +0000 (13:50 -0700)]
Support tab UI polish.
Bug:
29107343
Bug:
29101595
1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.
Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.
Bug:
29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
Sunny Goyal [Tue, 14 Jun 2016 17:00:56 +0000 (17:00 +0000)]
Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
am:
fef6234ebc
Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
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:18:18 +0000 (16:18 +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
am:
78a0197320
Change-Id: I0b6ba08845b6e58e1ecd314ff1e59c08be0c7beb
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
Ricky Wai [Mon, 13 Jun 2016 14:48:27 +0000 (15:48 +0100)]
Remove work fingerprints when primary profile lock is removed
Bug:
29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
Bill Yi [Tue, 14 Jun 2016 12:29:03 +0000 (12:29 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
7221f5b6b4 -s ours
am:
fee9c49fb2 -s ours
Change-Id: I7e0f8077871dddd2dc8f88039414abf238455600
Bill Yi [Tue, 14 Jun 2016 12:24:37 +0000 (12:24 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
35b37f1c2e -s ours
Change-Id: I0b7a42353b31b2db08b2ef8bf619a3ef88c6b1d2
Bill Yi [Tue, 14 Jun 2016 12:21:51 +0000 (12:21 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
7221f5b6b4 -s ours
am:
1779cc363d -s ours
Change-Id: Iea765783c5bbedcca58813728bd6da88f06320e5
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
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 02:02:35 +0000 (02:02 +0000)]
DND header should be translated. am:
5a67d5f6f0
am:
9850695bfc
Change-Id: I9e7538ba2ed31e374db6c6192d1faa00ba20f1ee
Julia Reynolds [Tue, 14 Jun 2016 02:02:07 +0000 (02:02 +0000)]
DND header should be translated. am:
5a67d5f6f0
am:
46298697ce
Change-Id: I9a3302467a75fae2ec01a63871ffcbefe08a58ff
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 [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
Doris Ling [Mon, 13 Jun 2016 22:29:14 +0000 (22:29 +0000)]
Merge \"Added new setting for gestures.\" into nyc-mr1-dev
am:
8b8a012913
Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
Daniel Nishi [Mon, 13 Jun 2016 22:28:38 +0000 (22:28 +0000)]
Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
am:
584320adb8
Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251
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
宋凯伦 [Mon, 13 Jun 2016 20:10:42 +0000 (20:10 +0000)]
resolve merge conflicts of
b34cf86 to nyc-dev-plus-aosp
am:
89b8babe6a
Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c