Bill Yi
fbd0f53df1
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 32b427b137
2016-06-16 10:28:56 +00:00
TreeHugger Robot
32b427b137
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-16 10:25:12 +00:00
Bill Yi
13cee79077
Import translations. DO NOT MERGE
...
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
2016-06-16 02:03:59 -07:00
Bill Yi
95fda91511
Import translations. DO NOT MERGE
...
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
2016-06-16 01:52:41 -07:00
Yohei Yukawa
966476b7dc
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
2016-06-16 00:02:01 -07:00
Android Build Merger (Role)
7f431178cf
Merge "BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b am: 20d6b425c5" into nyc-mr1-dev-plus-aosp
2016-06-16 02:02:06 +00:00
Roozbeh Pournader
4d70d4ffa1
BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b
...
am: 7d9cdfd4b6
2016-06-16 02:01:55 +00:00
Roozbeh Pournader
35d762f482
BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b
...
am: 20d6b425c5
2016-06-16 02:01:53 +00:00
Roozbeh Pournader
7d9cdfd4b6
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:37 +00:00
Roozbeh Pournader
20d6b425c5
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:22 +00:00
Daniel Nishi
4765fd9a4b
Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
...
am: 3d040e55d9
2016-06-15 22:19:34 +00:00
Daniel Nishi
3d040e55d9
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
2016-06-15 22:14:09 +00:00
Roozbeh Pournader
77893a4c4b
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
2016-06-15 14:46:11 -07:00
Android Build Merger (Role)
51a68b2c2d
Merge "Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f am: 420d46ee68" into nyc-mr1-dev-plus-aosp
2016-06-15 18:22:33 +00:00
Chris Wren
6e2c970988
Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
...
am: 420d46ee68
2016-06-15 18:22:25 +00:00
Chris Wren
a0e9f47a69
Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
...
am: 0a13cfbf8e
2016-06-15 18:22:17 +00:00
Chris Wren
0a13cfbf8e
Merge \"log as counters instead of histograms\" into nyc-dev
...
am: 6913b6118f
2016-06-15 18:17:52 +00:00
Chris Wren
420d46ee68
Merge \"log as counters instead of histograms\" into nyc-dev
...
am: 6913b6118f
2016-06-15 18:17:52 +00:00
TreeHugger Robot
6913b6118f
Merge "log as counters instead of histograms" into nyc-dev
2016-06-15 18:13:53 +00:00
Daniel Nishi
0074855229
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
2016-06-15 11:01:58 -07:00
Maurice Lam
c8466a339a
Merge \"Update UI style for GLIF buttons\" into nyc-mr1-dev
...
am: a028010c23
2016-06-15 17:59:24 +00:00
Maurice Lam
b2f98a37c0
Merge \"Fingerprint string updates\" into nyc-mr1-dev
...
am: e33872772c
2016-06-15 17:59:20 +00:00
Maurice Lam
a028010c23
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev
2016-06-15 17:07:54 +00:00
Jason Monk
deec78d0ca
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
...
am: 2f4c80f3c7
2016-06-15 17:07:30 +00:00
Maurice Lam
e33872772c
Merge "Fingerprint string updates" into nyc-mr1-dev
2016-06-15 17:07:27 +00:00
Jason Monk
2f4c80f3c7
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:59:09 +00:00
Jason Monk
4edb76127c
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
...
am: e3eaa08742
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:53:55 +00:00
TreeHugger Robot
b53117f55c
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
2016-06-15 16:48:45 +00:00
Ricky Wai
100f9e3f94
Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am: 42cbbc3052
...
am: 0f747c979d
2016-06-15 16:42:45 +00:00
Jason Monk
d506266338
Merge \\"Make linkify handle emptys urls better DO NOT MERGE\\" into nyc-dev am: f4ad4434f1
...
am: 4904ba543e
2016-06-15 16:42:45 +00:00
Ricky Wai
ea25035866
Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am: 42cbbc3052
...
am: 5ec65517a6
2016-06-15 16:42:05 +00:00
Jason Monk
359c8343dd
Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev
...
am: b2e2007766
2016-06-15 16:42:04 +00:00
Ricky Wai
5ec65517a6
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
...
am: 42cbbc3052
2016-06-15 16:38:28 +00:00
Jason Monk
b2e2007766
Merge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
2016-06-15 16:37:16 +00:00
Chris Wren
1753dfd5cd
log as counters instead of histograms
...
this will interoperate better with UMA
Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
2016-06-15 12:36:38 -04:00
Fan Zhang
b7e08a4fc6
Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
...
am: 1c6674dbb2
2016-06-15 16:17:20 +00:00
Fan Zhang
1c6674dbb2
Merge "Remove forum link from support tab." into nyc-mr1-dev
2016-06-15 16:15:54 +00:00
Ricky Wai
0f747c979d
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
...
am: 42cbbc3052
2016-06-15 16:04:41 +00:00
Ricky Wai
42cbbc3052
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
2016-06-15 16:02:18 +00:00
Jason Monk
90bde71e20
resolve merge conflicts of f4ad443 to nyc-mr1-dev
...
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
2016-06-15 11:31:14 -04:00
Jason Monk
4904ba543e
Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
...
am: f4ad4434f1
2016-06-15 15:03:26 +00:00
Jason Monk
c7959f91d5
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
2016-06-15 10:54:33 -04:00
Jason Monk
f4ad4434f1
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
2016-06-15 14:53:43 +00:00
Maurice Lam
4659661821
Fingerprint string updates
...
Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
2016-06-14 19:14:37 -07:00
Maurice Lam
52ae1eb04b
Update UI style for GLIF buttons
...
Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
2016-06-14 18:35:37 -07:00
Julia Reynolds
c9eae19abc
Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
...
am: 7803e3f76b
2016-06-14 22:33:55 +00:00
Julia Reynolds
a9f6b69398
Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
...
am: f04499b2e1
2016-06-14 22:33:34 +00:00
Julia Reynolds
7803e3f76b
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:33 +00:00
Julia Reynolds
f04499b2e1
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:19 +00:00
