Chet Haase
10ca6954bd
Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6
...
am: 8714d472bf
2017-06-26 18:28:44 +00:00
Chet Haase
8714d472bf
Merge "Fix TimePicker RTL issues" into oc-dev
...
am: 7b95c932d6
2017-06-26 18:18:46 +00:00
Chet Haase
7b95c932d6
Merge "Fix TimePicker RTL issues" into oc-dev
2017-06-26 18:07:32 +00:00
Jason Monk
02680636eb
Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
...
am: 43a0236891
2017-06-26 17:45:52 +00:00
Ying Xu
57ad8be7ec
Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
...
am: e30cfbea60
2017-06-26 17:36:15 +00:00
TreeHugger Robot
43a0236891
Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
2017-06-26 17:32:47 +00:00
Ying Xu
e30cfbea60
Merge "Fix the inconsistency of scan status." am: 41be35a1bd
...
am: ac2d00a195
2017-06-26 17:27:21 +00:00
Android Build Merger (Role)
658d7677fa
Merge "Merge "null check before dereference" into oc-dev am: df8569787c am: b5af86e444" into oc-dr1-dev-plus-aosp
2017-06-26 17:20:22 +00:00
Todd Kennedy
8c18322a58
Merge "null check before dereference" into oc-dev am: df8569787c
...
am: 6939301147
2017-06-26 17:18:43 +00:00
Ying Xu
ac2d00a195
Merge "Fix the inconsistency of scan status."
...
am: 41be35a1bd
2017-06-26 17:18:42 +00:00
Todd Kennedy
c4181096af
Merge "null check before dereference" into oc-dev am: df8569787c
...
am: b5af86e444
2017-06-26 17:18:39 +00:00
Todd Kennedy
6939301147
Merge "null check before dereference" into oc-dev
...
am: df8569787c
2017-06-26 17:10:14 +00:00
Todd Kennedy
b5af86e444
Merge "null check before dereference" into oc-dev
...
am: df8569787c
2017-06-26 17:10:13 +00:00
Ying Xu
41be35a1bd
Merge "Fix the inconsistency of scan status."
2017-06-26 17:05:59 +00:00
Daniel Nishi
d587b00830
Merge "Upstream getApplicationLabel()." into oc-dr1-dev
...
am: 7049137d7f
2017-06-26 17:04:03 +00:00
Sooraj Sasindran
dd807e6ba6
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
...
am: b7650d2233
2017-06-26 17:02:16 +00:00
TreeHugger Robot
df8569787c
Merge "null check before dereference" into oc-dev
2017-06-26 16:59:38 +00:00
Daniel Nishi
7049137d7f
Merge "Upstream getApplicationLabel()." into oc-dr1-dev
2017-06-26 16:58:18 +00:00
Sooraj Sasindran
b7650d2233
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
2017-06-26 16:50:26 +00:00
Pankaj Kanwar
70c1f55927
Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c
...
am: 01741762d8
2017-06-26 16:03:06 +00:00
Pankaj Kanwar
01741762d8
Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9
...
am: e26191a81c
2017-06-26 15:55:46 +00:00
Pankaj Kanwar
e26191a81c
Merge "Carrier Config changes to support IMSI encryption."
...
am: 1caaa514c9
2017-06-26 15:48:03 +00:00
Pankaj Kanwar
1caaa514c9
Merge "Carrier Config changes to support IMSI encryption."
2017-06-26 15:36:45 +00:00
Neil Fuller
58bcfb7d17
Merge "Avoid use of TimeZoneDistro.equals() method" am: fe0b43cb1e am: 6b5d71f7e5
...
am: 9e28f78763
2017-06-26 15:09:04 +00:00
Neil Fuller
9e28f78763
Merge "Avoid use of TimeZoneDistro.equals() method" am: fe0b43cb1e
...
am: 6b5d71f7e5
2017-06-26 15:01:37 +00:00
Neil Fuller
6b5d71f7e5
Merge "Avoid use of TimeZoneDistro.equals() method"
...
am: fe0b43cb1e
2017-06-26 14:53:58 +00:00
Todd Kennedy
7833e7c5cb
null check before dereference
...
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes: 62908319
Test: Manual
2017-06-26 07:51:54 -07:00
Paul Duffin
8d33b10edb
Merge "Remove a.t.TestCase" am: 3c5ab7d324 am: 930ab689f0
...
am: 143f5d652c
2017-06-26 14:50:38 +00:00
Paul Duffin
143f5d652c
Merge "Remove a.t.TestCase" am: 3c5ab7d324
...
am: 930ab689f0
2017-06-26 14:43:13 +00:00
Treehugger Robot
fe0b43cb1e
Merge "Avoid use of TimeZoneDistro.equals() method"
2017-06-26 14:40:31 +00:00
Paul Duffin
930ab689f0
Merge "Remove a.t.TestCase"
...
am: 3c5ab7d324
2017-06-26 14:35:01 +00:00
Paul Duffin
3c5ab7d324
Merge "Remove a.t.TestCase"
2017-06-26 14:24:31 +00:00
Chet Haase
e2dfa0e343
Fix TimePicker RTL issues
...
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)
This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.
Bug: 62846484 TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).
Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
2017-06-26 06:44:57 -07:00
Paul Duffin
4f9d89a380
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
...
am: 50826c5f2e
2017-06-26 13:21:28 +00:00
Paul Duffin
50826c5f2e
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
2017-06-26 13:15:09 +00:00
Hugo Benichi
99979253dd
Merge "IpManager: always log immediate provisioning errors" am: 98f2decdad am: 2d2f66d277
...
am: 834cf8d664
2017-06-26 12:12:20 +00:00
Hugo Benichi
834cf8d664
Merge "IpManager: always log immediate provisioning errors" am: 98f2decdad
...
am: 2d2f66d277
2017-06-26 12:07:12 +00:00
Hugo Benichi
2d2f66d277
Merge "IpManager: always log immediate provisioning errors"
...
am: 98f2decdad
2017-06-26 11:57:17 +00:00
Hugo Benichi
98f2decdad
Merge "IpManager: always log immediate provisioning errors"
2017-06-26 11:43:13 +00:00
Paul Duffin
88f06cba46
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am: 1ed43cafb6 am: 4601ebf945
...
am: 1fee4dcd5d
2017-06-26 11:42:54 +00:00
Paul Duffin
1fee4dcd5d
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am: 1ed43cafb6
...
am: 4601ebf945
2017-06-26 11:35:00 +00:00
Paul Duffin
4601ebf945
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
...
am: 1ed43cafb6
2017-06-26 11:27:36 +00:00
Paul Duffin
1ed43cafb6
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
2017-06-26 11:21:22 +00:00
Neil Fuller
9c90dc06a3
Avoid use of TimeZoneDistro.equals() method
...
The TimeZoneDistro method is going away.
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual
Bug: 31008728
Change-Id: Id90cf7ce534b888bf6df1bf1dc9d497608dcdbe9
2017-06-26 11:55:21 +01:00
Adam Vartanian
59410a96ed
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
...
am: c584a2596e
2017-06-26 10:12:56 +00:00
Adam Vartanian
c584a2596e
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
2017-06-26 10:08:31 +00:00
Adam Vartanian
835969714d
Add libcrypto to shared libraries of core/jni
...
This was added to master in ag/2447995 but not to aosp in aosp/420427,
which resulted in a failure in this branch.
Bug: 62991913
Test: make
Change-Id: Iefa0254c91e83da737a160f851c97ab3e6a7b0f8
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
2017-06-26 10:46:56 +01:00
Paul Duffin
ad654a3af5
Merge "Clean up TestCaseUtil" am: 43851d01d8 am: e38d503394
...
am: b5b6e7cf45
2017-06-26 09:41:44 +00:00
Paul Duffin
b5b6e7cf45
Merge "Clean up TestCaseUtil" am: 43851d01d8
...
am: e38d503394
2017-06-26 09:33:23 +00:00
Paul Duffin
e38d503394
Merge "Clean up TestCaseUtil"
...
am: 43851d01d8
2017-06-26 09:24:39 +00:00
