OSDN Git Service
Fan Zhang [Tue, 17 Oct 2017 01:21:00 +0000 (18:21 -0700)]
Add work-only-category controller
The controller will hide category if there is no child in it.
Change-Id: I9bbcc4115b991574e608933f98857b0b4eb2ed7d
Fixes:
62185871
Test: robotests
Fan Zhang [Fri, 13 Oct 2017 23:24:05 +0000 (23:24 +0000)]
Merge "Encapsulate AppFilter and its display label into 1 class"
Fan Zhang [Thu, 12 Oct 2017 18:09:24 +0000 (11:09 -0700)]
Encapsulate AppFilter and its display label into 1 class
Bug:
64804294
Test: robotests
Change-Id: I2a752794ded4ccb8510adf37d41afa4514d8c4c0
TreeHugger Robot [Fri, 13 Oct 2017 20:12:49 +0000 (20:12 +0000)]
Merge "Use ButtonBarLayout to stack buttons"
TreeHugger Robot [Fri, 13 Oct 2017 20:11:09 +0000 (20:11 +0000)]
Merge "There is no NEXT button in find sensor screen of fingerprint."
Jeffrey Huang [Fri, 13 Oct 2017 16:51:39 +0000 (16:51 +0000)]
Merge "Introduce DebugNonRectClipOperationsPreferenceCtrl"
Jeffrey Huang [Fri, 13 Oct 2017 16:51:18 +0000 (16:51 +0000)]
Merge "Introduce SecondaryDisplaysPreferenceController"
Jeffrey Huang [Fri, 13 Oct 2017 16:50:56 +0000 (16:50 +0000)]
Merge changes Ie94273c2,Ib9230336
* changes:
Introduce AbstractBluetoothA2dpPreferenceCtrl
Refactor A2dpStore to be a non-static object
Eric Schwarzenbach [Fri, 13 Oct 2017 16:40:12 +0000 (16:40 +0000)]
Merge "Show updated Speed Label on Wifi detail page."
Maurice Lam [Wed, 11 Oct 2017 00:06:16 +0000 (17:06 -0700)]
Use ButtonBarLayout to stack buttons
In fingerprint-enroll-finish landscape, if there is not enough space
to display the buttons, stack them by using ButtonBarLayout.
Bug:
67370165
Test: Manual
Change-Id: I482b811d6a2af545c4783a1cdd50b566c34b60c3
jeffreyhuang [Thu, 12 Oct 2017 00:45:48 +0000 (17:45 -0700)]
Introduce AbstractBluetoothA2dpPreferenceCtrl
- Refactor BluetoothAudioSampleRatePreferenceController into
AbstractBluetoothA2dpPreferenceController
- Make it easier to implement future bluetooth a2dp preferences
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie94273c2b97504f4fb63f11b1afc21abc6944ffb
TreeHugger Robot [Thu, 12 Oct 2017 22:46:43 +0000 (22:46 +0000)]
Merge "Move ManageApplications to sub package and remove dead code"
Fan Zhang [Wed, 11 Oct 2017 23:44:41 +0000 (16:44 -0700)]
Move ManageApplications to sub package and remove dead code
Bug:
64804294
Test: rerun test
Change-Id: I23cbd8da9b65f52470030ba3b9b676ece2bada11
Glen Kuhne [Thu, 12 Oct 2017 19:14:50 +0000 (19:14 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev am:
85f59ff42d
am:
91aeed6f55
Change-Id: I65d9d59816f9a1b248bfa9bcf7e801260f60bc01
Glen Kuhne [Thu, 12 Oct 2017 19:02:55 +0000 (19:02 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
am:
85f59ff42d
Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5
TreeHugger Robot [Thu, 12 Oct 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 18:37:37 +0000 (18:37 +0000)]
Merge "Check system support of wide-color"
jeffreyhuang [Thu, 12 Oct 2017 18:09:25 +0000 (11:09 -0700)]
Introduce DebugNonRectClipOperationsPreferenceCtrl
- Create new DebugNonRectClipOperationsPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I34349308819054bdd5256058f2de4f76a71f4677
jeffreyhuang [Thu, 12 Oct 2017 17:50:54 +0000 (10:50 -0700)]
Introduce SecondaryDisplaysPreferenceController
- Create new SecondaryDisplaysPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib1a7164b4e8fcf9ae8af96290d2baa33e25648f7
Jeffrey Huang [Thu, 12 Oct 2017 16:51:56 +0000 (16:51 +0000)]
Merge "Introduce TransitionAnimationScalePreferenceCtrl"
Courtney Goeltzenleuchter [Mon, 9 Oct 2017 23:13:47 +0000 (17:13 -0600)]
Check system support of wide-color
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.
Bug:
64801219
Bug:
67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.
Change-Id: If28e52da174dd460850bc84744818979f52add78
Beverly Tai [Thu, 12 Oct 2017 13:20:41 +0000 (13:20 +0000)]
Merge "Replaced dnd priority setting page w/ behavior."
Jeff Sharkey [Thu, 12 Oct 2017 02:09:05 +0000 (02:09 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7 am:
e9aa79dd1f
am:
25d86653b4 -s ours
Change-Id: I741ec983ea9d4ca96f9c14c645db262c9d3c663f
Jeff Sharkey [Thu, 12 Oct 2017 02:08:28 +0000 (02:08 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41 am:
1ddfd32006
am:
dfb5966d0c -s ours
Change-Id: I2007a6767547fa4ef1e74fd244977852e9889fdb
TreeHugger Robot [Thu, 12 Oct 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Clean up: remove unused code"
jeffreyhuang [Thu, 12 Oct 2017 00:21:50 +0000 (17:21 -0700)]
Refactor A2dpStore to be a non-static object
- Updated all methods to be non-static
- Introduced createCodecConfig to simplify controller code
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib923033645668fd7dd5529bdc9f5e4415023e11c
Jeff Sharkey [Thu, 12 Oct 2017 00:05:50 +0000 (00:05 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7 am:
1c4d686b0c
am:
920ca35d48 -s ours
Change-Id: I68137a70607e5b4ddf460d9c326c15804e728d49
Jeff Sharkey [Thu, 12 Oct 2017 00:05:00 +0000 (00:05 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41 am:
dcd1c0dde1
am:
5477a61da6 -s ours
Change-Id: Icfc98fefed776f7eea3180ae85fb60b0f3b0f682
Bill Yi [Thu, 12 Oct 2017 00:04:06 +0000 (00:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c43238e7f4 -s ours
am:
448638a650 -s ours
Change-Id: Ice0026e358fd70d6805c2638b4300133b9f2e208
Jeff Sharkey [Thu, 12 Oct 2017 00:03:31 +0000 (00:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05 am:
4d61a1bd15 am:
91719dc7bd
am:
85a79da59e -s ours
Change-Id: I22e2d3972fb8aab573f018f7e9b2c783b02e6e37
Jeff Sharkey [Thu, 12 Oct 2017 00:02:51 +0000 (00:02 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21 am:
de7c312543 am:
fb1bd3b2c6
am:
cc83075f0e -s ours
Change-Id: I2be142793c56ee1ac2a914c08eef296543319393
Jeff Sharkey [Thu, 12 Oct 2017 00:02:15 +0000 (00:02 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df am:
f4e2e26064 am:
d563d23d26
am:
a9e21a2864 -s ours
Change-Id: Ia2f6ee55e052ca9bf685c5c1606a0101ea0caf95
Fan Zhang [Wed, 11 Oct 2017 23:22:24 +0000 (16:22 -0700)]
Clean up: remove unused code
Bug:
64804294
Test: rerun existing robotests
Change-Id: I5a10cbd8475b74843e4d864eb38105003e98d27e
jeffreyhuang [Wed, 11 Oct 2017 23:41:17 +0000 (16:41 -0700)]
Introduce TransitionAnimationScalePreferenceCtrl
- Create new TransitionAnimationScalePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I521561c21cc572f311d3c2699fc877eec693ca3a
TreeHugger Robot [Wed, 11 Oct 2017 23:30:18 +0000 (23:30 +0000)]
Merge "Format data usage and data limit consistently."
Jeff Sharkey [Wed, 11 Oct 2017 22:50:08 +0000 (22:50 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7
am:
e9aa79dd1f
Change-Id: I5b0bd87504fa0843333bdbe01f9d96be3a4dabec
Jeff Sharkey [Wed, 11 Oct 2017 22:48:33 +0000 (22:48 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41
am:
1ddfd32006
Change-Id: Idcf3281d27502eeebe23e846dc7f3165dd4ada47
Jeff Sharkey [Wed, 11 Oct 2017 22:40:15 +0000 (22:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7
am:
1c4d686b0c
Change-Id: I2258de70628d91b3e3955391bc5ef999e2865c2d
Jeff Sharkey [Wed, 11 Oct 2017 22:38:38 +0000 (22:38 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41
am:
dcd1c0dde1
Change-Id: Ie97f00549bf2299165f5a32d72feae14fc92b796
Bill Yi [Wed, 11 Oct 2017 22:37:09 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c43238e7f4 -s ours
Change-Id: Idbf4df00a798f85d78e1953745659f09d4290c65
Jeff Sharkey [Wed, 11 Oct 2017 22:36:31 +0000 (22:36 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05 am:
4d61a1bd15
am:
91719dc7bd
Change-Id: I364e8d1b5239ef75e73236192e48ae936677f6fb
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21 am:
de7c312543
am:
fb1bd3b2c6
Change-Id: I395dc28cb99328191e93c2096bfdcb7889e82082
Jeff Sharkey [Wed, 11 Oct 2017 22:33:45 +0000 (22:33 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df am:
f4e2e26064
am:
d563d23d26
Change-Id: Id82fbbac6455d22623355e0f4c5e24733bd5d6e3
Jeff Sharkey [Wed, 11 Oct 2017 22:25:38 +0000 (22:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34
am:
8b399b3eb7
Change-Id: I29ec2e1b7fdfb6cc28ad011edaea2c2f2377fdf8
Jeff Sharkey [Wed, 11 Oct 2017 22:23:51 +0000 (22:23 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd
am:
9138455b41
Change-Id: I215d463a0b3631384c6963bd8217c912c286f594
Jeff Sharkey [Wed, 11 Oct 2017 22:19:18 +0000 (22:19 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34
am:
8b399b3eb7
Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
Jeff Sharkey [Wed, 11 Oct 2017 22:17:49 +0000 (22:17 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd
am:
9138455b41
Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503
TreeHugger Robot [Wed, 11 Oct 2017 22:16:37 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 22:02:29 +0000 (22:02 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours
am:
952ae3ec34
Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
Fan Zhang [Wed, 11 Oct 2017 21:57:22 +0000 (14:57 -0700)]
Format data usage and data limit consistently.
The usage formatter's format flag is change to match data limt flag.
Change-Id: I37d3c8c7bc67a918c793f4799e060010d269834d
Fixes:
63581756
Test: robotests
Jeff Sharkey [Wed, 11 Oct 2017 22:00:24 +0000 (22:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours
am:
0f53a56cbd
Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
Jeff Sharkey [Wed, 11 Oct 2017 21:55:34 +0000 (21:55 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05 am:
4d61a1bd15 am:
09112f231c
am:
1c91c0c801 -s ours
Change-Id: Ia80f31671b6416a233a9441df95a8eca00ef4806
Beverly [Mon, 25 Sep 2017 18:14:31 +0000 (14:14 -0400)]
Replaced dnd priority setting page w/ behavior.
Bug:
63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
Jeff Sharkey [Wed, 11 Oct 2017 21:54:43 +0000 (21:54 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21 am:
de7c312543 am:
c1574a1ef8
am:
c2198532bf -s ours
Change-Id: I1df2f438a20e129ed5d1237b85557fe2d9fd5295
Jeff Sharkey [Wed, 11 Oct 2017 21:53:47 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df am:
f4e2e26064 am:
8bdd94e292
am:
f70906f2da -s ours
Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679
Fan Zhang [Wed, 11 Oct 2017 21:52:47 +0000 (21:52 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils." am:
16db22a9c8 -s ours am:
e39bcb6bf5 -s ours am:
eef095d0ee -s ours
am:
78896c40ac -s ours
Change-Id: I6f0a723c30e1afb2eb6147eba3dd29b060ceb7b1
Jeff Sharkey [Wed, 11 Oct 2017 21:47:52 +0000 (21:47 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05
am:
4d61a1bd15
Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a
Jeff Sharkey [Wed, 11 Oct 2017 21:46:44 +0000 (21:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21
am:
de7c312543
Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
Jeff Sharkey [Wed, 11 Oct 2017 21:45:11 +0000 (21:45 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df
am:
f4e2e26064
Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44
am:
e803004863 -s ours
Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
Jeff Sharkey [Wed, 11 Oct 2017 21:42:14 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb
am:
250d5e60b0 -s ours
Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6
Jeff Sharkey [Wed, 11 Oct 2017 21:35:26 +0000 (21:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05 am:
4d61a1bd15
am:
09112f231c
Change-Id: I816186e9a1e6719c88b7121a65071b8dc29981b2
Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79
am:
2433b6dc44
Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37
Jeff Sharkey [Wed, 11 Oct 2017 21:33:51 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21 am:
de7c312543
am:
c1574a1ef8
Change-Id: I2eb18e0ad264898662f921ba3cf582a2875bdad4
Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3
am:
3aa36a6afb
Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7
Jeff Sharkey [Wed, 11 Oct 2017 21:32:33 +0000 (21:32 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df am:
f4e2e26064
am:
8bdd94e292
Change-Id: I12e601375713fd8491007e93ae5133e3bbfd0b6c
Fan Zhang [Wed, 11 Oct 2017 21:31:35 +0000 (21:31 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils." am:
16db22a9c8 -s ours am:
e39bcb6bf5 -s ours
am:
eef095d0ee -s ours
Change-Id: I14bd887cac26c0b3ced671d971f4d059a061088d
TreeHugger Robot [Wed, 11 Oct 2017 21:31:08 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Wed, 11 Oct 2017 21:28:47 +0000 (21:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9 am:
9173362f4e am:
cf1c0b1f58
am:
9c5abedc54 -s ours
Change-Id: Iab5f91b3de3c13dab622983132a514dcac79ca95
Jeff Sharkey [Wed, 11 Oct 2017 21:28:38 +0000 (21:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05
am:
4d61a1bd15
Change-Id: Icc827672d37662817ccf7e0e2be21c685f96bc79
Jeff Sharkey [Wed, 11 Oct 2017 21:28:09 +0000 (21:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9 am:
9173362f4e am:
0b34b23f8b
am:
50af9f6724 -s ours
Change-Id: Ie348305e5605ae90d48774eb89cad6c0b6400bb8
Jeff Sharkey [Wed, 11 Oct 2017 21:27:27 +0000 (21:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21
am:
de7c312543
Change-Id: I46cb89e7594fae1988f5ea08416549019452332e
Jeff Sharkey [Wed, 11 Oct 2017 21:26:28 +0000 (21:26 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df
am:
f4e2e26064
Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394
Jeff Sharkey [Wed, 11 Oct 2017 21:24:25 +0000 (21:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours
am:
47bc5fba05
Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848
Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d
am:
d721694b79
Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be
Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239
am:
53a69985b3
Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3
Jeff Sharkey [Wed, 11 Oct 2017 21:12:41 +0000 (21:12 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda
am:
efe9e7e003 -s ours
Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f
Fan Zhang [Wed, 11 Oct 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils." am:
16db22a9c8 -s ours
am:
e39bcb6bf5 -s ours
Change-Id: I0e2e798dee860a0d708fec3313b3b4c7f2ab3f79
Jeff Sharkey [Wed, 11 Oct 2017 21:10:10 +0000 (21:10 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours
am:
b410435a21
Change-Id: I91421c6629af2131e7aaeadac048c92da9653212
Jeff Sharkey [Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am:
9c39da39df
Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e
am:
86cc9a681d
Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd
Fan Zhang [Wed, 11 Oct 2017 21:01:23 +0000 (21:01 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils."
am:
16db22a9c8 -s ours
Change-Id: I7a4a2d5326b1e617beab32a4be4bfe5b7de7409a
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3
am:
b3d4bc8239
Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f
Jeff Sharkey [Wed, 11 Oct 2017 20:57:51 +0000 (20:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0
am:
fe1daa6eda
Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965
Jeff Sharkey [Wed, 11 Oct 2017 20:49:46 +0000 (20:49 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9 am:
9173362f4e
am:
cf1c0b1f58
Change-Id: I502a85737c41f79068e2a2d7417cce8e52957794
Jeff Sharkey [Wed, 11 Oct 2017 20:47:27 +0000 (20:47 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9 am:
9173362f4e
am:
0b34b23f8b
Change-Id: I8c323e0cde1c1bf060c6214b7f0a81441a5e7e5b
Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours
am:
004f90f35e
Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
Treehugger Robot [Wed, 11 Oct 2017 20:45:19 +0000 (20:45 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils."
Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours
am:
89791cb5c3
Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
Jeff Sharkey [Wed, 11 Oct 2017 20:44:53 +0000 (20:44 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf
am:
979efb53d0
Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c
Jeff Sharkey [Wed, 11 Oct 2017 20:39:07 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346
am:
46bc2bd7bd -s ours
Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc
Jeff Sharkey [Wed, 11 Oct 2017 20:36:04 +0000 (20:36 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9
am:
9173362f4e
Change-Id: Ifeffebaae3402a18fc1eb4883f46f7827e2b23df
Jeff Sharkey [Wed, 11 Oct 2017 20:35:37 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9
am:
9173362f4e
Change-Id: I8eb3e136b4edb5858a681fb69c0f90d216255e55
Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7
am:
ba66bb8a43 -s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb
am:
45926efd0f -s ours
Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
TreeHugger Robot [Wed, 11 Oct 2017 20:32:55 +0000 (20:32 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab
am:
95bbef26d7
Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499
am:
556688abdb
Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d
am:
7c41707eaf
Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30
Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188
am:
e38a7f42ab
Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
OSDN Git Service
