OSDN Git Service
Doris Ling [Wed, 24 Aug 2016 02:09:25 +0000 (02:09 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba
am:
12a0952d49
Change-Id: Iac5b318d0bc9f929e34fac9c46dfd3b020889738
Doris Ling [Wed, 24 Aug 2016 01:59:09 +0000 (18:59 -0700)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
am:
c4e5acedba
Change-Id: Ice4efccbb63061053bc1b2ea75f65fcfe41555d0
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Log settings suggestions events only once.
am:
bfbb964cb1
Change-Id: If4e3e15b56c7e5a99eb54376c519019ff44d6a34
Doris Ling [Tue, 23 Aug 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 21:46:42 +0000 (21:46 +0000)]
Add scrollbar to Settings app. am:
124251d54e
am:
13a4eeb2a9
Change-Id: Ifbb3c930d259bc65ec54ffa496c2cfcdb5bb9a63
Doris Ling [Tue, 23 Aug 2016 21:43:33 +0000 (21:43 +0000)]
Add scrollbar to Settings app.
am:
124251d54e
Change-Id: Id59772914f83860c5ff46ace71d640e17623c98d
Doris Ling [Tue, 2 Aug 2016 21:45:58 +0000 (14:45 -0700)]
Log settings suggestions events only once.
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes:
30108142
Rubin Xu [Tue, 23 Aug 2016 18:31:19 +0000 (18:31 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:
0948ce0cdb
am:
f9665da994
Change-Id: Ia5c441a86cfd6cc9c4c3ba0c207c4289ea5a4bb2
Rubin Xu [Tue, 23 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Remove duplicated call to authenticationSucceeded() am:
3a437490be
am:
886af76fb3
Change-Id: Ic0154eef40bfe90a62644405e35092ac037db000
Rubin Xu [Tue, 23 Aug 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am:
7a4ecbac12
am:
bd7e2376fc
Change-Id: I07dbf8982e52bf83b111988e50dd0f41b83403cb
Rubin Xu [Tue, 23 Aug 2016 18:30:10 +0000 (18:30 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am:
da9f9a0fab
am:
7425b2d677
Change-Id: I69aad745936b8d53fbe9389d8ff8f7e2d3b98d66
Doris Ling [Tue, 23 Aug 2016 18:30:09 +0000 (18:30 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am:
6cdd5fccd8
am:
7849b2044c
Change-Id: I56adf86e478ac08dda17c3ad45ba862d50c952e7
Doris Ling [Tue, 23 Aug 2016 18:30:08 +0000 (18:30 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents. am:
7574b64910
am:
0f7d5f36a3
Change-Id: I91f1ee6cebb8af959b0dbed6aa213fae4c8de605
Doris Ling [Tue, 23 Aug 2016 18:30:07 +0000 (18:30 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am:
e9af5024a1
am:
7c529e5ba8
Change-Id: Ib5ce02c97c0f9f72c101c0412b232483f0893cc3
Doris Ling [Tue, 23 Aug 2016 18:29:11 +0000 (18:29 +0000)]
Update Jump to Camera gesture settings description text. am:
8d9b89ed5c
am:
b9ed707735
Change-Id: Ic4a89942d6007a1d96b1fc5c500bb3124575e7d2
Doris Ling [Tue, 23 Aug 2016 18:29:10 +0000 (18:29 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am:
cf988e3d64
am:
f1c69ead73
Change-Id: Ib00c8325f8dbf5b54c8ab00b43fe42eccc89ccf0
Doris Ling [Tue, 23 Aug 2016 18:29:09 +0000 (18:29 +0000)]
Fix caption text being cut off when text size is set to very large. am:
0f625ae280
am:
3768e718c6
Change-Id: I213e38d90f0fe8c5df5f7026ed9e652401d1fd69
Doris Ling [Tue, 23 Aug 2016 18:29:08 +0000 (18:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am:
15c13f9e10
am:
ea445c9db7
Change-Id: I7fc61672c9df0a808c0a07723346678222c4ccf3
Doris Ling [Tue, 23 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Fix margin in Tap & pay -> Payment default. am:
9e29ac7983
am:
88842736d7
Change-Id: Ia933244f4d9bf6cf2700f1815a77bbfcf47468e0
Matthew Fritze [Tue, 23 Aug 2016 18:28:04 +0000 (18:28 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am:
88d3cb7176
am:
c9be13f26e
Change-Id: Ia249e3ea91b80d443be64c19f0a89da133a5a2c8
Matthew Fritze [Tue, 23 Aug 2016 18:27:59 +0000 (18:27 +0000)]
Stop apps with Storage Managers from launching activity when disabled am:
1051fe1e14
am:
7444ee791c
Change-Id: Ia358b60aff78a967663112399a260ffc2de27668
Salvador Martinez [Tue, 23 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am:
4c8776627b
am:
b3b0fd931b
Change-Id: Ib36fed3ad37831b957bf445e1ad116dacb49baf0
Salvador Martinez [Tue, 23 Aug 2016 18:27:52 +0000 (18:27 +0000)]
Disabled BSM mode switch when plugged in am:
d4a6768880
am:
18d58269a8
Change-Id: I3001c4e21f5e1bcae64074962ab4399f0787aaa3
Salvador Martinez [Tue, 23 Aug 2016 18:27:49 +0000 (18:27 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am:
4f6755931e
am:
a60628517f
Change-Id: Ie9a865fc1cc13a1b516d2b4a99eca84cc5adfeb7
Salvador Martinez [Tue, 23 Aug 2016 18:26:40 +0000 (18:26 +0000)]
Made dialog material design compliant am:
cfee94d448
am:
676db52b64
Change-Id: I2b5cdd12cda5b364afb1532e548b090144084a45
Salvador Martinez [Tue, 23 Aug 2016 18:26:39 +0000 (18:26 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am:
0e98c73666
am:
5817342f14
Change-Id: Id0d329a2a682e46a0168ed47f6fdba8e3163a6c9
Salvador Martinez [Tue, 23 Aug 2016 18:26:38 +0000 (18:26 +0000)]
Settings Focus prevented from moving to pref am:
41fc4e8cb7
am:
ce14c1e5eb
Change-Id: I56f870955b8bc534e21fec821404fe38c75a8e65
Salvador Martinez [Tue, 23 Aug 2016 18:26:37 +0000 (18:26 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724
am:
d31d90eecf
Change-Id: Icfc80e8e55a41cbc4039e5075cd883a5ebf6d2c8
Salvador Martinez [Tue, 23 Aug 2016 18:26:33 +0000 (18:26 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e
am:
56ebf2a051
Change-Id: I0cf475280dd390e55befd285c33cde593e8c7878
Doris Ling [Thu, 18 Aug 2016 22:16:23 +0000 (15:16 -0700)]
Add scrollbar to Settings app.
Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.
Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes:
30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
Rubin Xu [Tue, 23 Aug 2016 16:22:49 +0000 (16:22 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev
am:
0948ce0cdb
Change-Id: I3bafba20cd5a44eb9af7de66e056dc5cc558b63e
Rubin Xu [Tue, 23 Aug 2016 16:22:49 +0000 (16:22 +0000)]
Remove duplicated call to authenticationSucceeded()
am:
3a437490be
Change-Id: I929ab9d63c5100b30bfec87ee6be0b4d1164cc81
Rubin Xu [Tue, 23 Aug 2016 16:07:40 +0000 (16:07 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
am:
7a4ecbac12
Change-Id: Id5ee904fbde064dba4702cdb9bae99c063d96d94
Rubin Xu [Tue, 23 Aug 2016 16:07:36 +0000 (16:07 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog
am:
da9f9a0fab
Change-Id: I2a45a4530fdd25f372f08315a21ca92c453bcdd9
Doris Ling [Tue, 23 Aug 2016 16:07:32 +0000 (16:07 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev
am:
6cdd5fccd8
Change-Id: If5eba9204524418e94c71a8278e7f64d2cb9cdf4
Doris Ling [Tue, 23 Aug 2016 16:07:29 +0000 (16:07 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents.
am:
7574b64910
Change-Id: I9ade2a06180e6464ab105c1a12c5383aa480f77a
Doris Ling [Tue, 23 Aug 2016 16:07:25 +0000 (16:07 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev
am:
e9af5024a1
Change-Id: I96a1065ccd019d71b70149e9966359523825f2f9
Doris Ling [Tue, 23 Aug 2016 16:07:23 +0000 (16:07 +0000)]
Update Jump to Camera gesture settings description text.
am:
8d9b89ed5c
Change-Id: If069afdba7a7d7d4f8ce8038dabdebd0a0ee13de
Doris Ling [Tue, 23 Aug 2016 16:07:19 +0000 (16:07 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev
am:
cf988e3d64
Change-Id: Ie46fff82f0630407d46fc21f8b1558acdcaea063
Doris Ling [Tue, 23 Aug 2016 16:07:17 +0000 (16:07 +0000)]
Fix caption text being cut off when text size is set to very large.
am:
0f625ae280
Change-Id: Id3e95f1c92bd0550114acab7cd136b43f6469b80
Doris Ling [Tue, 23 Aug 2016 16:07:13 +0000 (16:07 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
am:
15c13f9e10
Change-Id: I814e027259acc0b084f2b8a86bfc73ecdf453331
Doris Ling [Tue, 23 Aug 2016 16:07:10 +0000 (16:07 +0000)]
Fix margin in Tap & pay -> Payment default.
am:
9e29ac7983
Change-Id: I04ffd2ec727a87096c554ae452ed58f5c2483f1e
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
am:
88d3cb7176
Change-Id: I9c081c2f701033ba9f74c73a70fd7ea50e5cd6f5
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Stop apps with Storage Managers from launching activity when disabled
am:
1051fe1e14
Change-Id: Ib2ae9dcbd034c36c44addfaea0bc84ebe3f2247b
Salvador Martinez [Tue, 23 Aug 2016 14:43:43 +0000 (14:43 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
am:
4c8776627b
Change-Id: Ifadf14eb2f4cf46da098bad92b795dc6ff0e67e1
Salvador Martinez [Tue, 23 Aug 2016 14:43:42 +0000 (14:43 +0000)]
Disabled BSM mode switch when plugged in
am:
d4a6768880
Change-Id: I9e8116dd9413090145b7ef98b37db20706471c28
Salvador Martinez [Tue, 23 Aug 2016 14:43:41 +0000 (14:43 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
am:
4f6755931e
Change-Id: Ia60e7c612435c2215789a749231d2df78de411be
Salvador Martinez [Tue, 23 Aug 2016 14:43:40 +0000 (14:43 +0000)]
Made dialog material design compliant
am:
cfee94d448
Change-Id: If01b0f216ff0a8cadaa0d659b89a0c03136ce406
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
am:
0e98c73666
Change-Id: Iad871a4333675bde9c1c18b50f91aed6976dada8
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Settings Focus prevented from moving to pref
am:
41fc4e8cb7
Change-Id: Ifc9b53a0514830e73a06311e27acbca57b476a0d
Salvador Martinez [Tue, 23 Aug 2016 14:43:37 +0000 (14:43 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am:
89d138b724
Change-Id: I2d3d0996f4fcbfa234c46d6a7c50c84ca7517c77
Salvador Martinez [Tue, 23 Aug 2016 14:43:36 +0000 (14:43 +0000)]
Prevent wifi icon from disappearing
am:
5c0063af7e
Change-Id: I1039ce10631d7f792cae36c3a171d90df11a9e33
Rubin Xu [Tue, 23 Aug 2016 13:07:02 +0000 (13:07 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev
Rubin Xu [Tue, 23 Aug 2016 12:59:16 +0000 (12:59 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:51:21 +0000 (01:51 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:37:29 +0000 (01:37 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:30:27 +0000 (01:30 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:32:39 +0000 (22:32 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am:
5b5cf5a2c7
am:
f4ccb09603
Change-Id: I8f699fe1077e0fb120211c8b7e451d9b46da6404
Salvador Martinez [Mon, 22 Aug 2016 22:32:34 +0000 (22:32 +0000)]
Tests for launch support on default feature am:
3fb4e96b0d
am:
6c07416eba
Change-Id: I5ed71234e55ecbfbf160b860122ba73cc18d1707
Salvador Martinez [Mon, 22 Aug 2016 22:32:25 +0000 (22:32 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev am:
5bd202e277
am:
a9dc4d46ca
Change-Id: I9144185ab2a1e47364d6e8720481f3741b70f615
Salvador Martinez [Mon, 22 Aug 2016 22:32:20 +0000 (22:32 +0000)]
can open settings with support tab by default am:
12c5208ad0
am:
8d47bdc773
Change-Id: I223e42c2bc89e3f95a0fed9cc74ebfb21932370f
Lei Yu [Mon, 22 Aug 2016 22:32:19 +0000 (22:32 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am:
2363094863
am:
ffc6372e7d
Change-Id: Ib86849dbdbfd1521c0715f839aba8c2acdc6538b
jackqdyulei [Mon, 22 Aug 2016 22:32:18 +0000 (22:32 +0000)]
Make number in dialog highlighted am:
7a78213776
am:
226ccfe62f
Change-Id: Ie22cae038131a206f2d8a246ba3cd80398ba7cff
Lei Yu [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am:
dd90acf2c0
am:
69db34ed2e
Change-Id: Ifdb6298262e2c2269e83c815cd376066fb7ec4e9
jackqdyulei [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Fix the nullpointer bug in monkey test. am:
409c4708c1
am:
fbed8d95e9
Change-Id: Ia93f4051af386b8d6dee02d7c617fe75730e9fc2
TreeHugger Robot [Mon, 22 Aug 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:21:03 +0000 (22:21 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev
am:
5b5cf5a2c7
Change-Id: I7c855c5e352f57fb32a81baa891a83993fc926ca
Salvador Martinez [Mon, 22 Aug 2016 22:21:02 +0000 (22:21 +0000)]
Tests for launch support on default feature
am:
3fb4e96b0d
Change-Id: I3b3e4c1e717861856a1c5daf9d9bc9047629dae1
Salvador Martinez [Mon, 22 Aug 2016 22:20:58 +0000 (22:20 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
am:
5bd202e277
Change-Id: I0100549be28207d38ac040e8e7cd5fd5c3c1447f
Salvador Martinez [Mon, 22 Aug 2016 22:20:54 +0000 (22:20 +0000)]
can open settings with support tab by default
am:
12c5208ad0
Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b
Lei Yu [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
am:
2363094863
Change-Id: Ie93f7f491f2ccc5747963be5ba44e1e9c94fc584
jackqdyulei [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Make number in dialog highlighted
am:
7a78213776
Change-Id: I1b5fb80a2a38a1224d6aa586d1ff2065c4a2a32a
Lei Yu [Mon, 22 Aug 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
am:
dd90acf2c0
Change-Id: I61637865ac2eed318d46e568b61f8eecc03713ab
jackqdyulei [Mon, 22 Aug 2016 22:20:50 +0000 (22:20 +0000)]
Fix the nullpointer bug in monkey test.
am:
409c4708c1
Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2
Salvador Martinez [Mon, 22 Aug 2016 21:56:21 +0000 (21:56 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:56:05 +0000 (21:56 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:18 +0000 (21:55 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Fri, 29 Jul 2016 16:50:56 +0000 (09:50 -0700)]
Tests for launch support on default feature
Includes some espresso tests to ensure that the proper
tab is selected when you attempt to launch settings.
Bug:
30233920
Change-Id: I171293114bd84b064b333091fcf2394d44debed5
(cherry picked from commit
d1ef20beaa3c69e038860fd610f076892d428da2)
Lei Yu [Mon, 22 Aug 2016 21:50:29 +0000 (21:50 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:43:23 +0000 (21:43 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am:
45fd5c4d4e
am:
a5785b72bb
Change-Id: Id7383a0e5565e5b1d8544553c6fdc10d75de26cf
Fan Zhang [Mon, 22 Aug 2016 21:43:22 +0000 (21:43 +0000)]
Set oem unlock switch to reflect the actual state of device am:
1ba24ca792
am:
ede4f9d41f
Change-Id: I61f6cc2ec3dc40f27dc1ac943a2305c41a826a88
Bill Yi [Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
b98e47c79b -s ours
am:
0d15b016db -s ours
Change-Id: I0e8a0a446a27c6b1e946829a9f6b895548bdc72f
Bill Yi [Mon, 22 Aug 2016 21:42:11 +0000 (21:42 +0000)]
Import translations. DO NOT MERGE am:
f58be49ba8 -s ours
am:
4114547feb -s ours
Change-Id: Icac1aca6c6f4d09de537b606b42ae1bb1c2ce457
Fan Zhang [Mon, 22 Aug 2016 21:42:10 +0000 (21:42 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am:
5a6fad7607
am:
93c6887768
Change-Id: If1fd73e98e2f06278e71d282a55d036215e7c50b
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Have a fallback package name when matching targetPackage. am:
0c58131c37
am:
2dd0275d66
Change-Id: I4ecd52a133db924a47fcaf843a32c64227134fd8
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am:
ce8a222a59
am:
562d8276a6
Change-Id: Ie6ec75ea45b9bb94652ce649ce1e7bdf68b74135
Fan Zhang [Mon, 22 Aug 2016 21:42:07 +0000 (21:42 +0000)]
Align text to view start so they layout correctly in RTL. am:
be56fc17ed
am:
eebdb575ba
Change-Id: Ie72f4716ae0fe55b7f3fffb7f100031f5122add7
Fan Zhang [Mon, 22 Aug 2016 21:37:49 +0000 (21:37 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
am:
45fd5c4d4e
Change-Id: I6ea35fe7eb8b6b8d711b128ada6da50284896a40
Fan Zhang [Mon, 22 Aug 2016 21:37:48 +0000 (21:37 +0000)]
Set oem unlock switch to reflect the actual state of device
am:
1ba24ca792
Change-Id: I77c374d43d6f78cf57cf2a1a9bb505538d86c9aa
Bill Yi [Mon, 22 Aug 2016 21:37:47 +0000 (21:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
b98e47c79b -s ours
Change-Id: I5b2018c5885abc17a04d5e5a1bae92178cd9e854
Bill Yi [Mon, 22 Aug 2016 21:37:45 +0000 (21:37 +0000)]
Import translations. DO NOT MERGE
am:
f58be49ba8 -s ours
Change-Id: Ia9c43520ca258a2b85c47c417016f689723935ee
Fan Zhang [Mon, 22 Aug 2016 21:37:44 +0000 (21:37 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
am:
5a6fad7607
Change-Id: I227c1571ba527529af038bf805c15f8b0bc803a4
Fan Zhang [Mon, 22 Aug 2016 21:37:43 +0000 (21:37 +0000)]
Have a fallback package name when matching targetPackage.
am:
0c58131c37
Change-Id: I0c57b1a71c6388a3fdfc761b44b142abfdf40bcb
Fan Zhang [Mon, 22 Aug 2016 21:37:42 +0000 (21:37 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
am:
ce8a222a59
Change-Id: I2c8356156df5a938add968561efccdcc3affe72e
OSDN Git Service
