Matthew Fritze
|
ae181aeac1
|
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88 am: d983045488
am: d4abdb67d3
Change-Id: I5b3c5c9f0bd542f00af359dbf1ea2c8158ace8f8
|
2016-10-07 18:26:11 +00:00 |
|
Matthew Fritze
|
6d24cd89ca
|
The center column of the support tab is back to white am: 2d07290453 am: 409714d0e4
am: a70964091a
Change-Id: Ic9ae4d2fd08f9a840d3a2431d6ab4292258df873
|
2016-10-07 18:25:54 +00:00 |
|
Salvador Martinez
|
7baa08b8d1
|
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf am: 17866f0b17
am: 0967f79ce0
Change-Id: I555f0b2911e995e417af078d275b062fae1f6efa
|
2016-10-07 18:25:34 +00:00 |
|
Salvador Martinez
|
062358f8ad
|
Added onClick logic for domain url list screen am: 26e5760033 am: 1d383e1220
am: 6a832d4db6
Change-Id: I15c67361c870f846641dbc1b96d1f8701af54301
|
2016-10-07 18:25:15 +00:00 |
|
Bill Yi
|
6bede85d06
|
Import translations. DO NOT MERGE am: a6b32526d7 -s ours am: f6a7a97ab5 -s ours
am: 1e7f5e9dd7 -s ours
Change-Id: I9461da3a3a36f7e9845251cc3c44908281a8edbb
|
2016-10-07 18:24:58 +00:00 |
|
Fan Zhang
|
79ff72adc8
|
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc am: 207bb2947e
am: 6b72c17434
Change-Id: I8ab6ad5ace2b737bfb9e68cc350aa45dbc836d01
|
2016-10-07 18:24:41 +00:00 |
|
Fan Zhang
|
9f9e42d0f9
|
Fix a NPE in confirm lock screen. am: 8b2baed2be am: da856402f4
am: ac053b6179
Change-Id: I40cca984f15ff6a3ffb193d53e47d46ddc393274
|
2016-10-07 18:24:24 +00:00 |
|
Jeff Sharkey
|
2360dfa2ff
|
Switch to static warning threshold when adopting. am: bd7adb9313 am: da414d0afe
am: 049d2b88f6
Change-Id: Ie30f3242174699a2e8ad08c311e9993da4187e6f
|
2016-10-07 18:24:07 +00:00 |
|
Jonathan Nieder
|
1de59a63af
|
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2 am: 64136f30d1
am: 27615e6b49
Change-Id: Ic3cd78dadd1eb0687b6080d59f2c05dd83662e6e
|
2016-10-07 18:15:48 +00:00 |
|
Doris Ling
|
c037ed5bdb
|
Add condition check for double tap gesture settings. am: c8b7555fc9 am: 7f62890cad
am: a5eb66eb01
Change-Id: I0d56e0b1e3b25bd589fcfd4ba2301d51369f217e
|
2016-10-07 18:15:40 +00:00 |
|
Matthew Fritze
|
dc9088c311
|
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381 am: 62fcf9369f
am: dabb84876b
Change-Id: I01551ebecdee7b029d62bd76b833d062ccfdfb40
|
2016-10-07 18:15:09 +00:00 |
|
Matthew Fritze
|
4443a2e7bb
|
Fix bug preventing users from clicking settings suggestions twice am: f265dbc447 am: e5e60eccaf
am: 5b509e12ff
Change-Id: Iab38544e2e6fa2cb500fbbdc997dacd9dc611198
|
2016-10-07 18:14:51 +00:00 |
|
Jeff Sharkey
|
673250bcb1
|
Give CTS the handle it expects to remove PIN. am: 7be1b5923f am: 4ae8eb2aae
am: 2eda02e617
Change-Id: If61a3086f49151db5c46fbc19dbe70b816de2e13
|
2016-10-07 18:00:48 +00:00 |
|
Lei Yu
|
36d2a62930
|
Merge "Adjustments based on the changes in ZoneGetter(settingslib)"
|
2016-10-07 17:34:22 +00:00 |
|
Bill Yi
|
cb054fff54
|
Import translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours am: 784b1cbf35 -s ours
am: 4b9f135da5 -s ours
Change-Id: If4bc2da9b0ec543fed1ec0f75362f311a6775623
|
2016-10-07 15:06:16 +00:00 |
|
Lei Yu
|
6cbfb84836
|
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66 am: d7f2c10f94
am: efaf3b502f
Change-Id: I79a7bd27ff6c6e7109b1f0a6cb03992b73135436
|
2016-10-07 15:05:50 +00:00 |
|
jackqdyulei
|
32b01bffdd
|
Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78 am: 00ed827516
am: 15c14f0cc2
Change-Id: I2322d0d3e496013cfb02444b2224fab1eecb47b9
|
2016-10-07 15:02:47 +00:00 |
|
TreeHugger Robot
|
fbe72822b4
|
Merge "Remove old unused activity."
|
2016-10-07 02:54:30 +00:00 |
|
Bill Yi
|
65629f36c0
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours am: f0be222981 -s ours
am: 4d6ff7e669 -s ours
Change-Id: Ifc72d70787d079c2e53d5ec7a39d4da4163b2a5d
|
2016-10-07 01:28:19 +00:00 |
|
Bill Yi
|
88b083f02e
|
Import translations. DO NOT MERGE am: 8aee525418 -s ours am: 47f6271d15 -s ours
am: b30d988a1c -s ours
Change-Id: I430a63f2b012f187ce9a0efe6b9f97182a5af8cb
|
2016-10-07 01:28:05 +00:00 |
|
Lorenzo Colitti
|
8e4f0035c1
|
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a am: bb529c267d
am: 03cbc81f32
Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4
|
2016-10-07 01:27:53 +00:00 |
|
Lorenzo Colitti
|
5a63070109
|
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b
Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
|
2016-10-07 01:27:38 +00:00 |
|
Matthew Fritze
|
9fa8e96b6f
|
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf am: 9264154bee
am: 927007dd53
Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4
|
2016-10-07 01:27:24 +00:00 |
|
Bill Yi
|
1943100912
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours am: ffae7d82c3 -s ours
am: c8ef13d120 -s ours
Change-Id: Ic0c4a0ba5246c2cff4db7064d1ca4ff5f3bbf89e
|
2016-10-07 01:27:08 +00:00 |
|
Bill Yi
|
02c28ed262
|
Import translations. DO NOT MERGE am: ae33f8e62c -s ours am: b1f3f659f1 -s ours
am: 5fb2b6c1c5 -s ours
Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71
|
2016-10-07 01:26:52 +00:00 |
|
Philip P. Moltmann
|
b2d459b970
|
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367 am: ae23c07073
am: 96d81b1332
Change-Id: I9469b566e8682162271992f3175c5153c4668614
|
2016-10-07 01:26:36 +00:00 |
|
Philip P. Moltmann
|
e98d7e074d
|
USB restriction is similar to media restriction am: 13ee50be48 am: a78fced068
am: 58154e8c27
Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74
|
2016-10-07 00:35:19 +00:00 |
|
Fan Zhang
|
d56ad9dc61
|
Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
|
2016-10-06 17:03:37 -07:00 |
|
Matthew Fritze
|
d4abdb67d3
|
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88
am: d983045488
Change-Id: I67fd24b1e7647f0216983d5a16f868c16a90cadc
|
2016-10-06 22:53:47 +00:00 |
|
Matthew Fritze
|
a70964091a
|
The center column of the support tab is back to white am: 2d07290453
am: 409714d0e4
Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456
|
2016-10-06 22:53:33 +00:00 |
|
Matthew Fritze
|
d983045488
|
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am: 9f95a59b88
Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
|
2016-10-06 22:49:58 +00:00 |
|
Matthew Fritze
|
409714d0e4
|
The center column of the support tab is back to white
am: 2d07290453
Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
|
2016-10-06 22:49:56 +00:00 |
|
Salvador Martinez
|
0967f79ce0
|
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf
am: 17866f0b17
Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1
|
2016-10-06 22:46:46 +00:00 |
|
Salvador Martinez
|
6a832d4db6
|
Added onClick logic for domain url list screen am: 26e5760033
am: 1d383e1220
Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc
|
2016-10-06 22:46:32 +00:00 |
|
Matthew Fritze
|
9f95a59b88
|
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
|
2016-10-06 22:43:28 +00:00 |
|
Salvador Martinez
|
17866f0b17
|
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am: 8a468ccbdf
Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72
|
2016-10-06 22:42:57 +00:00 |
|
Salvador Martinez
|
1d383e1220
|
Added onClick logic for domain url list screen
am: 26e5760033
Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b
|
2016-10-06 22:42:56 +00:00 |
|
Salvador Martinez
|
8a468ccbdf
|
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
|
2016-10-06 22:37:05 +00:00 |
|
Stephen Chen
|
9d66f6f738
|
Merge "Fix icon loading in EditUserInfo dialog on orientation change."
|
2016-10-06 22:36:52 +00:00 |
|
TreeHugger Robot
|
840208bc77
|
Merge "Use a Digit TtsSpan for pairing pins for talkback."
|
2016-10-06 22:12:30 +00:00 |
|
Bill Yi
|
1e7f5e9dd7
|
Import translations. DO NOT MERGE am: a6b32526d7 -s ours
am: f6a7a97ab5 -s ours
Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12
|
2016-10-06 21:55:00 +00:00 |
|
Fan Zhang
|
6b72c17434
|
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc
am: 207bb2947e
Change-Id: Ied103f6707f804a8b386d0f0d3df1837c5b98571
|
2016-10-06 21:54:46 +00:00 |
|
Fan Zhang
|
ac053b6179
|
Fix a NPE in confirm lock screen. am: 8b2baed2be
am: da856402f4
Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059
|
2016-10-06 21:54:30 +00:00 |
|
Jeff Sharkey
|
049d2b88f6
|
Switch to static warning threshold when adopting. am: bd7adb9313
am: da414d0afe
Change-Id: I111c8b3ea63deb6e9797a520f1431d73adc16c99
|
2016-10-06 21:54:16 +00:00 |
|
Jonathan Nieder
|
27615e6b49
|
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2
am: 64136f30d1
Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a
|
2016-10-06 21:52:45 +00:00 |
|
Doris Ling
|
a5eb66eb01
|
Add condition check for double tap gesture settings. am: c8b7555fc9
am: 7f62890cad
Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f
|
2016-10-06 21:52:33 +00:00 |
|
Matthew Fritze
|
dabb84876b
|
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
am: 62fcf9369f
Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0
|
2016-10-06 21:52:02 +00:00 |
|
Matthew Fritze
|
5b509e12ff
|
Fix bug preventing users from clicking settings suggestions twice am: f265dbc447
am: e5e60eccaf
Change-Id: I956ed80ce27ec50378901111f5679b163719628f
|
2016-10-06 21:51:47 +00:00 |
|
Jeff Sharkey
|
2eda02e617
|
Give CTS the handle it expects to remove PIN. am: 7be1b5923f
am: 4ae8eb2aae
Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920
|
2016-10-06 21:15:12 +00:00 |
|
Bill Yi
|
4b9f135da5
|
Import translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours
am: 784b1cbf35 -s ours
Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71
|
2016-10-06 21:10:21 +00:00 |
|