OSDN Git Service
Lucas Dupin [Sat, 17 Jun 2017 17:26:20 +0000 (17:26 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
am:
11cc260047
Change-Id: If99425cb57a322900f476227932cdcadd85abf00
Lucas Dupin [Sat, 17 Jun 2017 17:20:59 +0000 (17:20 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 11:36:22 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3a759c93b8 -s ours
Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f
TreeHugger Robot [Sat, 17 Jun 2017 11:29:10 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
767d02158e -s ours
Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0
Bill Yi [Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
dee1ecf9df -s ours
Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5
Bill Yi [Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
c4e253af2a -s ours
Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066
TreeHugger Robot [Sat, 17 Jun 2017 06:10:52 +0000 (06:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:07:03 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2
Bill Yi [Sat, 17 Jun 2017 06:06:58 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74
TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 17 Jun 2017 04:22:31 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6dc3d54f22f40b9079b6a7e55def38409cc48e89
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 17 Jun 2017 03:05:09 +0000 (03:05 +0000)]
Merge "Merge "Only preload selected pages" into oc-dev am:
314457a424 am:
4116849cfb" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Sat, 17 Jun 2017 03:02:42 +0000 (03:02 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424
am:
1af7c0bdbe
Change-Id: Ia3ecca3507a8d3b2e18dee59f83af0c0804ab68c
Philip P. Moltmann [Sat, 17 Jun 2017 03:02:37 +0000 (03:02 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424
am:
4116849cfb
Change-Id: I9dd4081136a3a3369f954acdd296b99976a31458
Philip P. Moltmann [Sat, 17 Jun 2017 02:57:26 +0000 (02:57 +0000)]
Merge "Only preload selected pages" into oc-dev
am:
314457a424
Change-Id: Ice10d16e149ce7807c50b413939cb71caf52f715
Philip P. Moltmann [Sat, 17 Jun 2017 02:55:42 +0000 (02:55 +0000)]
Merge "Only preload selected pages" into oc-dev
am:
314457a424
Change-Id: Id45d32474d29f4e71fa85997088e7a478b659baf
TreeHugger Robot [Sat, 17 Jun 2017 02:49:55 +0000 (02:49 +0000)]
Merge "Only preload selected pages" into oc-dev
Android Build Merger (Role) [Sat, 17 Jun 2017 02:35:37 +0000 (02:35 +0000)]
Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e am:
a2f661612d" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Sat, 17 Jun 2017 02:32:45 +0000 (02:32 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e
am:
a2f661612d
Change-Id: Iff19ad943b40ba317542ddebb505eb27175ac627
Sundeep Ghuman [Sat, 17 Jun 2017 02:32:36 +0000 (02:32 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e
am:
4127bdafc7
Change-Id: Iee8ffdde7970a5c623f4820d3e27531df2beb795
Sundeep Ghuman [Sat, 17 Jun 2017 02:26:02 +0000 (02:26 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
am:
65c00b2f4e
Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98
Sundeep Ghuman [Sat, 17 Jun 2017 02:25:57 +0000 (02:25 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
am:
65c00b2f4e
Change-Id: I46fc6ca0334f2637007fc188304310475267a20c
TreeHugger Robot [Sat, 17 Jun 2017 02:15:02 +0000 (02:15 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
Myles Watson [Sat, 17 Jun 2017 01:47:35 +0000 (01:47 +0000)]
Merge "Simplify NfcCommand and avoid NullPointerExceptions" am:
b5c4e80ecd am:
7ba9270427
am:
ffd0a7d95c
Change-Id: Ia3ac938a14df46beb18d49803732ee953dabf0f3
Myles Watson [Sat, 17 Jun 2017 01:41:09 +0000 (01:41 +0000)]
Merge "Simplify NfcCommand and avoid NullPointerExceptions" am:
b5c4e80ecd
am:
7ba9270427
Change-Id: I28b151f93f00cbd3086e8416dbd433f34806205c
Bill Yi [Sat, 17 Jun 2017 01:39:16 +0000 (18:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2e2ab20c78bfcf7ab82807c33466fed3116236b
Auto-generated-cl: translation import
Myles Watson [Sat, 17 Jun 2017 01:34:00 +0000 (01:34 +0000)]
Merge "Simplify NfcCommand and avoid NullPointerExceptions"
am:
b5c4e80ecd
Change-Id: I2dcff4d7d0b0bdc5b344f08ce5d563da0a272ddf
Treehugger Robot [Sat, 17 Jun 2017 01:25:12 +0000 (01:25 +0000)]
Merge "Simplify NfcCommand and avoid NullPointerExceptions"
Jaewoong Jung [Sat, 17 Jun 2017 01:22:27 +0000 (01:22 +0000)]
Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev
am:
4f52665122
Change-Id: I7d78b51fbf568586f7fb9b3581eadae39b57304c
Bill Yi [Sat, 17 Jun 2017 01:21:10 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcfe6dcd80d6a3877a54a192fcdb019ed87fc99a
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 17 Jun 2017 01:15:06 +0000 (01:15 +0000)]
Merge "Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am:
215ebb941d am:
730924cd65" into oc-dr1-dev-plus-aosp
Felipe Leme [Sat, 17 Jun 2017 01:14:06 +0000 (01:14 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am:
215ebb941d
am:
730924cd65
Change-Id: Ib6d0ed75d7ac5b7ae5c6785082710359e1b23f09
Android Build Merger (Role) [Sat, 17 Jun 2017 01:13:37 +0000 (01:13 +0000)]
Merge "Merge "Separate a11y and autofill view ids" into oc-dev am:
c91290a6e9 am:
0da21f56e4" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Sat, 17 Jun 2017 01:12:02 +0000 (01:12 +0000)]
Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev
Phil Weaver [Sat, 17 Jun 2017 01:10:28 +0000 (01:10 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev am:
c91290a6e9
am:
0da21f56e4
Change-Id: Idddd94dece2282fc09524e662646ea6a869da3ff
Felipe Leme [Sat, 17 Jun 2017 01:09:38 +0000 (01:09 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am:
215ebb941d
am:
1581ceb1fb
Change-Id: Ia8931bffb2a19993b598fcf6ecf9f09ab5157614
Android Build Merger (Role) [Sat, 17 Jun 2017 01:06:38 +0000 (01:06 +0000)]
Merge "Merge "Separate a11y and autofill view ids" into oc-dev am:
c91290a6e9 am:
8b2816faa3" into oc-dr1-dev-plus-aosp
Phil Weaver [Sat, 17 Jun 2017 01:05:36 +0000 (01:05 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev am:
c91290a6e9
am:
8b2816faa3
Change-Id: I567471d68e6ad5b60fcf33eda47e5d99bdb49f2b
Android Build Merger (Role) [Sat, 17 Jun 2017 01:05:21 +0000 (01:05 +0000)]
Merge "Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am:
4ab690a50d am:
5f485cab2b" into oc-dr1-dev-plus-aosp
Lucas Dupin [Mon, 5 Jun 2017 15:40:39 +0000 (08:40 -0700)]
K-Means color clustering
Test: runtest -x tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java
Bug:
37014702
Change-Id: Idabc163df5ded362acbe462ae6b351394a36db10
Felipe Leme [Sat, 17 Jun 2017 01:04:08 +0000 (01:04 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am:
215ebb941d
Change-Id: I058b5fd135e4165214116055ccdc04e9d99955b0
Casey Burkhardt [Sat, 17 Jun 2017 01:02:57 +0000 (01:02 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am:
4ab690a50d
am:
8097485c28
Change-Id: I0c21a256e612fd2ecfb2dce6c4d28e3c33e075e2
Casey Burkhardt [Sat, 17 Jun 2017 01:02:56 +0000 (01:02 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am:
4ab690a50d
am:
5f485cab2b
Change-Id: I9cc746da6edaac51159503d39fab4a2f2a205788
Felipe Leme [Sat, 17 Jun 2017 01:01:25 +0000 (01:01 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am:
215ebb941d
Change-Id: I4adf0b0ed352f7f20f93c5fe1bbebea84b4b9bda
Phil Weaver [Sat, 17 Jun 2017 00:59:04 +0000 (00:59 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev
am:
c91290a6e9
Change-Id: Iec71a9ae34f963ef1f0ce7f6bd09b5af5bbba6e6
Phil Weaver [Sat, 17 Jun 2017 00:56:19 +0000 (00:56 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev
am:
c91290a6e9
Change-Id: Ib4566c2f0e32477d5f9eb6510edc140c2b66e0a4
TreeHugger Robot [Sat, 17 Jun 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
Casey Burkhardt [Sat, 17 Jun 2017 00:52:47 +0000 (00:52 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
am:
4ab690a50d
Change-Id: Ia86c49759f9dac2c40b5c28609ab283efb41cd02
Casey Burkhardt [Sat, 17 Jun 2017 00:52:46 +0000 (00:52 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
am:
4ab690a50d
Change-Id: I38798fabc99c8db5618a6bd39c8eb6953dbf2bbb
Phil Weaver [Sat, 17 Jun 2017 00:45:59 +0000 (00:45 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev
Casey Burkhardt [Sat, 17 Jun 2017 00:40:57 +0000 (00:40 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
Myles Watson [Fri, 16 Jun 2017 23:55:32 +0000 (23:55 +0000)]
Merge "Add a svc command for enabling/disabling Bluetooth" am:
7d136b777a am:
c0c6e1243b
am:
d84e4812ef
Change-Id: I3e5c762fd7e3e11d14ff335a7ed7b963b3c8b53f
Myles Watson [Fri, 16 Jun 2017 23:47:57 +0000 (23:47 +0000)]
Merge "Add a svc command for enabling/disabling Bluetooth" am:
7d136b777a
am:
c0c6e1243b
Change-Id: Iab78d232230a6d9ef02d40a03558f7967af7f48c
Myles Watson [Fri, 16 Jun 2017 23:40:26 +0000 (23:40 +0000)]
Merge "Add a svc command for enabling/disabling Bluetooth"
am:
7d136b777a
Change-Id: I62158ee728e6c431c21e5de30ecd9b7b33bbc73a
Android Build Merger (Role) [Fri, 16 Jun 2017 23:36:40 +0000 (23:36 +0000)]
Merge "Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am:
1e1c5d7b77 am:
e2aec03b9c" into oc-dr1-dev-plus-aosp
Bryce Lee [Fri, 16 Jun 2017 23:33:06 +0000 (23:33 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am:
1e1c5d7b77
am:
e2aec03b9c
Change-Id: Ibfc7ddbb44f50e78aceab07648489ac1499d57ab
Bryce Lee [Fri, 16 Jun 2017 23:33:03 +0000 (23:33 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am:
1e1c5d7b77
am:
14d9e3a529
Change-Id: I722724da6c83337bd810dc3ebe44d5a65451924c
Treehugger Robot [Fri, 16 Jun 2017 23:28:23 +0000 (23:28 +0000)]
Merge "Add a svc command for enabling/disabling Bluetooth"
Bryce Lee [Fri, 16 Jun 2017 23:24:34 +0000 (23:24 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
am:
1e1c5d7b77
Change-Id: I2f402ea2a6003e5306a7bbcf1d7b8d640672d460
Bryce Lee [Fri, 16 Jun 2017 23:24:31 +0000 (23:24 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
am:
1e1c5d7b77
Change-Id: I35b9aa813c4140cc273272421a05df22b69aeb2e
Bryce Lee [Fri, 16 Jun 2017 23:15:03 +0000 (23:15 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
Peter Qiu [Fri, 16 Jun 2017 23:12:29 +0000 (23:12 +0000)]
Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev
am:
d1a616761d
Change-Id: Ic149568e7e8dabb4b7bd7db165ea150209a74d6d
Myles Watson [Tue, 13 Jun 2017 18:42:36 +0000 (11:42 -0700)]
Add a svc command for enabling/disabling Bluetooth
Bug:
62067926
Test: svc bluetooth disable
svc bluetooth enable
Change-Id: I9a53d7ab1805df98d8cf1292cf1061eacc14655d
Android Build Merger (Role) [Fri, 16 Jun 2017 23:09:48 +0000 (23:09 +0000)]
Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c am:
2de4d6bce4" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 23:06:47 +0000 (23:06 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c
am:
1c03d3fcef
Change-Id: I8f94db3b3b129caca53f3cb0ed0b16b2a4951648
Felipe Leme [Fri, 16 Jun 2017 23:06:46 +0000 (23:06 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c
am:
2de4d6bce4
Change-Id: I8eb50d5191b2393011c297671bd5d3c65e1beb7e
TreeHugger Robot [Fri, 16 Jun 2017 23:06:31 +0000 (23:06 +0000)]
Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev
* changes:
Osu2: add class for managing Wi-Fi network connection
Osu2: setup ProvisionService
Osu2: basic app setup
Android Build Merger (Role) [Fri, 16 Jun 2017 23:03:25 +0000 (23:03 +0000)]
Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours am:
24a5477e03 -s ours" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 23:00:14 +0000 (23:00 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am:
b3b13ff62c
Change-Id: I5a96a3f2613aeaad1f3d146b5ce6a208b1180851
Tyler Freeman [Fri, 16 Jun 2017 22:58:54 +0000 (22:58 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours
am:
24a5477e03 -s ours
Change-Id: I624498ada7c6fb4705dca185325edb3cd9ac0d77
Tyler Freeman [Fri, 16 Jun 2017 22:58:51 +0000 (22:58 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours
am:
19bb979224 -s ours
Change-Id: Iabcffdb4bc4ab990a19a6f3a44804b8bc0122a04
Felipe Leme [Fri, 16 Jun 2017 22:57:58 +0000 (22:57 +0000)]
Revert "Trim text from autofillvalue when checking for empty."
This reverts commit
c5d4e068f2a0c47dc69b72200f8a9fc4bd5a2c28.
Change-Id: I4027cf0f91ebb9032c21efad7025118891188bc6
Felipe Leme [Fri, 16 Jun 2017 22:57:29 +0000 (22:57 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am:
b3b13ff62c
Change-Id: I4059509efe6cfa0b2f3acdf8fdfb99b4daeca0bb
Tyler Freeman [Fri, 16 Jun 2017 22:51:31 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours
am:
2c3ca52a91 -s ours
Change-Id: Ia77b2954ecafe93cf01381c0c1fe781612187229
Tyler Freeman [Fri, 16 Jun 2017 22:51:28 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours
am:
2c3ca52a91 -s ours
Change-Id: Iebb31d8ff579fb03e6d814493777ccac96d94eae
TreeHugger Robot [Fri, 16 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
Tyler Freeman [Fri, 16 Jun 2017 22:43:12 +0000 (22:43 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours
am:
cf82b09998 -s ours
Change-Id: I128c5a5b07fc2aef5ada9118e3cc491a87970758
Android Build Merger (Role) [Fri, 16 Jun 2017 22:37:42 +0000 (22:37 +0000)]
Merge "Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361 am:
833ca781fc" into oc-dr1-dev-plus-aosp
Tyler Freeman [Fri, 16 Jun 2017 22:36:26 +0000 (22:36 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.
am:
79613777df -s ours
Change-Id: I965bac24a8d62b44b08679bda58b8ba37dbed5b4
Wale Ogunwale [Fri, 16 Jun 2017 22:36:22 +0000 (22:36 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361
am:
833ca781fc
Change-Id: I3aa4c01c2df5aa57df3fad27a8a4473d2a42ebc0
Wale Ogunwale [Fri, 16 Jun 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361
am:
a7bf2a0ed9
Change-Id: I15f45b209c12fc7e70f3bf9b6a2fda9ddf50cc2a
Android Build Merger (Role) [Fri, 16 Jun 2017 22:27:57 +0000 (22:27 +0000)]
Merge "Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8 am:
5ddad3b748" into oc-dr1-dev-plus-aosp
Tony Mantler [Fri, 16 Jun 2017 22:25:03 +0000 (22:25 +0000)]
Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8
am:
d537d3778b
Change-Id: Iebc6356304bb7a4cd9ff9a3af28bb24343938cd7
Tony Mantler [Fri, 16 Jun 2017 22:24:57 +0000 (22:24 +0000)]
Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8
am:
5ddad3b748
Change-Id: I577b06fb7b377017b64cea9a590355db033c23bb
Wale Ogunwale [Fri, 16 Jun 2017 22:21:11 +0000 (22:21 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
am:
e8f1a74361
Change-Id: I9dc6c865260e783eeba32b7c86d45b31ab49688c
Wale Ogunwale [Fri, 16 Jun 2017 22:15:21 +0000 (22:15 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
am:
e8f1a74361
Change-Id: I6c9e5fdd75717b1c4fc0ba723afe3ff8797f3a16
Android Build Merger (Role) [Fri, 16 Jun 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d am:
3df52cc28d" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 22:12:17 +0000 (22:12 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d
am:
3df52cc28d
Change-Id: I5e3e075b5bad2bd611d949ab247c84aa7386aee8
Tony Mantler [Fri, 16 Jun 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
am:
b5979092b8
Change-Id: Iec7f207648a7df13c2d963be4b48f3286ded2dc2
Tony Mantler [Fri, 16 Jun 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
am:
b5979092b8
Change-Id: I37ec878ac1629e0f145481863b82ad59572c7e73
Felipe Leme [Fri, 16 Jun 2017 22:11:13 +0000 (22:11 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d
am:
1c5cb925b8
Change-Id: Iddb2da7c24035f9d1280eef667b059c032affa94
Felipe Leme [Fri, 16 Jun 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
am:
a89414962d
Change-Id: I70d76618c929bdfeee715909c70a678fbc5f4a3e
Felipe Leme [Fri, 16 Jun 2017 21:59:45 +0000 (21:59 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
am:
a89414962d
Change-Id: Ie4bebf468d564dcf67ed56b6152f49f2c5f5cda1
Jaewoong Jung [Fri, 16 Jun 2017 01:02:44 +0000 (18:02 -0700)]
Allows to change summary text in a custom view tile.
Now it becomes possible to use META_DATA_PREFERENCE_SUMMARY_URI in
in conjunction with META_DATA_PREFERENCE_CUSTOM_VIEW.
Bug:
62384773
Test: make RunSettingsLibRoboTests -j40
Change-Id: I91401140b2ed0b12c26b91c8fb3d464179e75844
Android Build Merger (Role) [Fri, 16 Jun 2017 21:58:05 +0000 (21:58 +0000)]
Merge "Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c am:
09a3325f41" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 21:57:20 +0000 (21:57 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:57:02 +0000 (21:57 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c
am:
09a3325f41
Change-Id: Ic30e6938ccb02facf186fbb4526e7e085996d62c
TreeHugger Robot [Fri, 16 Jun 2017 21:55:28 +0000 (21:55 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:55:23 +0000 (21:55 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c
am:
552bdceeaf
Change-Id: I38941bde24946fcfa1598f71d58c1e9b40316974
OSDN Git Service
