OSDN Git Service
Christine Franks [Fri, 16 Jun 2017 14:47:57 +0000 (14:47 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev am:
ddd692cf1a
am:
3fb1655289
Change-Id: I10bf8db6918676588558c453f36b71c6f82872f2
Christine Franks [Fri, 16 Jun 2017 14:43:56 +0000 (14:43 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
am:
ddd692cf1a
Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
Christine Franks [Fri, 16 Jun 2017 14:36:10 +0000 (14:36 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
Tony Mak [Fri, 16 Jun 2017 13:06:23 +0000 (13:06 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev am:
e3d890eaae -s ours
am:
caac960e1a -s ours
Change-Id: I085d29824d90f74b5254f1efc4e18056d8814eb4
Tony Mak [Fri, 16 Jun 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
am:
e3d890eaae -s ours
Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd
TreeHugger Robot [Fri, 16 Jun 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
Charles He [Fri, 16 Jun 2017 11:49:14 +0000 (11:49 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev am:
add67648c7
am:
569a238509
Change-Id: Ibae09f8a237e528aa9122d1fc26142e1ede10629
Charles He [Fri, 16 Jun 2017 11:44:42 +0000 (11:44 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
am:
add67648c7
Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
Charles He [Fri, 16 Jun 2017 11:36:05 +0000 (11:36 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
Tony Mak [Fri, 16 Jun 2017 11:03:45 +0000 (11:03 +0000)]
Merge "Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours am:
a59e02fd58" into oc-dr1-dev-plus-aosp
am:
41a66cccc1 -s ours
Change-Id: I164ec412f672c397ec5dc79077690e2ec57a960f
Tony Mak [Fri, 16 Jun 2017 11:03:13 +0000 (11:03 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
am:
248cdec3e2 -s ours
Change-Id: Id990b4dd2af8fa724facf501f36b2d587a34d908
Android Build Merger (Role) [Fri, 16 Jun 2017 10:59:24 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours am:
a59e02fd58" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 10:59:21 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
Tony Mak [Fri, 16 Jun 2017 10:59:13 +0000 (10:59 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce am:
80cdf176e9 -s ours
am:
5d25a0c796 -s ours
Change-Id: I80bc94d6fff7eef72efb21392ce6c43ab0dd0ea6
Tony Mak [Fri, 16 Jun 2017 10:59:11 +0000 (10:59 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours
am:
a59e02fd58
Change-Id: Idb771b9bca8e0e1d93dc9f9f8b9312bae33d9165
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce -s ours
Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce
am:
80cdf176e9 -s ours
Change-Id: Iea2c278565436cde6cd1fb8d5c58f7b972c7c2e7
TreeHugger Robot [Fri, 16 Jun 2017 02:19:42 +0000 (02:19 +0000)]
Merge "Remove some dead code"
Maurice Lam [Fri, 16 Jun 2017 01:37:46 +0000 (01:37 +0000)]
Allow skipping PIN setup screen am:
4c930fc2d5
am:
adb206fec5
Change-Id: I3ea2310633c0a01858a9f6d5cf04793bd40cd1b0
TreeHugger Robot [Fri, 16 Jun 2017 01:32:17 +0000 (01:32 +0000)]
Merge "May nfc_payments_how_it_works layout scrollable."
Maurice Lam [Fri, 16 Jun 2017 01:15:20 +0000 (01:15 +0000)]
Allow skipping PIN setup screen
am:
4c930fc2d5
Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
TreeHugger Robot [Thu, 15 Jun 2017 23:09:27 +0000 (23:09 +0000)]
Merge "Add divider line below "see all apps" preference"
Tony Mak [Thu, 15 Jun 2017 22:29:04 +0000 (22:29 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce
Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
Fan Zhang [Thu, 15 Jun 2017 21:03:23 +0000 (14:03 -0700)]
Remove some dead code
DashboardCategory is no longer rendered in the dashboard ui
Bug:
33861822
Test: make RunSettingsRoboTests existing tests still pass
Change-Id: I0479967b0099f76f8c0c7894643d50b655de2892
Christine Franks [Thu, 15 Jun 2017 17:04:21 +0000 (10:04 -0700)]
Update Night display icon in Settings
Bug:
62658839
Test: Night display qs tile icon matches the icon used in the Night
display condition in Settings.
Change-Id: Ie319c9c94604dd630d5cf66f114a4de4397c2694
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit
0f897d79f698920f1c0e0c102a7985704ffa196e)
Tony Mak [Mon, 12 Jun 2017 17:31:40 +0000 (18:31 +0100)]
Fix searching work app in settings NO PARTIAL RERUN
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
Fan Zhang [Thu, 15 Jun 2017 18:11:00 +0000 (11:11 -0700)]
Add divider line below "see all apps" preference
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix:
62040104
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 15 Jun 2017 18:21:29 +0000 (18:21 +0000)]
Merge "Fix searching work app in settings"
TreeHugger Robot [Thu, 15 Jun 2017 18:08:16 +0000 (18:08 +0000)]
Merge "Update category for AccountDetailDashboardFragment."
Alison Cichowlas [Thu, 15 Jun 2017 15:06:28 +0000 (11:06 -0400)]
Add separator line in notification settings,
above link to in-app settings.
Test: make RunSettingsRoboTests
Bug:
62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
Charles He [Thu, 15 Jun 2017 09:57:23 +0000 (10:57 +0100)]
Escape apostrophes in ConfirmCredential strings.
Bug:
62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
Sundeep Ghuman [Thu, 15 Jun 2017 06:53:40 +0000 (06:53 +0000)]
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours am:
ea46967c2e -s ours" into oc-dr1-dev-plus-aosp
am:
bb71287d3c -s ours
Change-Id: Ie95eb695e4e8453d5b0bd3785de0c0668e394149
Sundeep Ghuman [Thu, 15 Jun 2017 06:53:09 +0000 (06:53 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 am:
0c02e22c99 -s ours
am:
51b31c5354 -s ours
Change-Id: Idcb397b3de44fc56c92340032171cb80f46e86e6
Android Build Merger (Role) [Thu, 15 Jun 2017 06:45:45 +0000 (06:45 +0000)]
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours am:
ea46967c2e -s ours" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:21 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours
am:
ea46967c2e -s ours
Change-Id: I12005bef18a23f1aad2c1b5b9ee7982206426a5f
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:20 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5
am:
0c02e22c99 -s ours
Change-Id: Iea1015089c955056d319f5365c1fb8d07e7acb93
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:42 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5 -s ours
Change-Id: I68959f0803cd714d540299ac916616a933594c00
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5
Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
TreeHugger Robot [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 04:24:26 +0000 (04:24 +0000)]
Allow WifiSettings to show old APs on app resume. am:
4ae59dde43
am:
6ab460c354
Change-Id: I1f3b7d405ea6e98d4cfa0a69b4468494f7867d4a
Sundeep Ghuman [Thu, 15 Jun 2017 04:21:38 +0000 (04:21 +0000)]
Allow WifiSettings to show old APs on app resume.
am:
4ae59dde43
Change-Id: I57cb72fcdcbe98223ccda71f1ae6de2756b7ec08
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
MANUAL MERGE of ag/
2398149 to avoid merge conflicts when trying to
submit to oc-dev.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Doris Ling [Wed, 14 Jun 2017 22:25:24 +0000 (15:25 -0700)]
Update category for AccountDetailDashboardFragment.
- use a separate category key for AccountDetailDashboardFragment instead
of sharing the same key with UserAndAccountDashboardFragment. Tile using
the original category will now show up at the top level account
setting, and tile using the new account detail detail will be displayed
under the specified account type.
Bug:
62446202
Test: make RunSettingsRoboTests
Change-Id: I06f781a20f24498bdc6207aef5469be9cd0c8e47
TreeHugger Robot [Wed, 14 Jun 2017 21:33:19 +0000 (21:33 +0000)]
Merge "Refactor hotspot into a full page"
TreeHugger Robot [Wed, 14 Jun 2017 20:54:14 +0000 (20:54 +0000)]
Merge "Update string for reset screen"
Fan Zhang [Tue, 6 Jun 2017 23:55:53 +0000 (16:55 -0700)]
Refactor hotspot into a full page
- Deprecated WifiAPEnabler, and copied most of its logic into various
controllers and WifiTetherSettings.
- Added tests
Fix:
37253404
Fix:
36181835
Test: make RunSettingsRoboTests
Change-Id: Iad994d61b694ad7f1113d045a3e7500eeaec178b
Fan Zhang [Wed, 14 Jun 2017 18:43:05 +0000 (11:43 -0700)]
Update string for reset screen
Change-Id: Ia36b5011f3a0effa91e07bd6fd0f90c6ee742877
Fix:
62265094
Test: manual
Tony Mantler [Wed, 14 Jun 2017 18:07:12 +0000 (18:07 +0000)]
Merge "Use Settings.ACTION_ADD_ACCOUNT"
Kevin Chyn [Wed, 14 Jun 2017 02:00:37 +0000 (02:00 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev am:
6f365765f7
am:
36d4b81119
Change-Id: I789735e5c4c72b16597320b62b46ad2fbf46acc5
Kevin Chyn [Wed, 14 Jun 2017 01:51:50 +0000 (01:51 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
am:
6f365765f7
Change-Id: I23f3bdbcbd60c80842a51da61a16225252dc179c
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
Tarandeep Singh [Wed, 14 Jun 2017 00:27:16 +0000 (00:27 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev am:
fc9622ef53
am:
4c2ef7c144
Change-Id: I8e38b190c0d28c763eb95e476ca21f0672a31727
Tarandeep Singh [Wed, 14 Jun 2017 00:06:44 +0000 (00:06 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
am:
fc9622ef53
Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
jackqdyulei [Tue, 13 Jun 2017 23:58:14 +0000 (23:58 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev am:
e7735b8d52
am:
010c9d9535
Change-Id: I5d7d02d5387b8d58d8ea6f158311c1aae659fe19
TreeHugger Robot [Tue, 13 Jun 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 23:11:35 +0000 (23:11 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev am:
9871df58f1
am:
9922ec065d
Change-Id: Ib948ffa809eb64b9077f20e174d1e2b89ede38a0
jackqdyulei [Tue, 13 Jun 2017 23:10:40 +0000 (23:10 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev am:
d907b99d79
am:
0966eeb919
Change-Id: I9ac8bee459bdc7409e0c46112e5c59bb69032c50
jackqdyulei [Tue, 13 Jun 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
am:
e7735b8d52
Change-Id: I01b51abb73fdc39597388878a846266c339815e2
TreeHugger Robot [Tue, 13 Jun 2017 22:36:04 +0000 (22:36 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:22:13 +0000 (22:22 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
am:
9871df58f1
Change-Id: I0f5e5069ff4a69004dce46921f894cde9d4d854f
Tony Mantler [Tue, 13 Jun 2017 22:16:50 +0000 (15:16 -0700)]
Use Settings.ACTION_ADD_ACCOUNT
Bug:
62586588
Test: No functional change
Change-Id: I01ffc240fe7299a6d5f08c390870eaf3ba0f4260
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
Kevin Chyn [Fri, 9 Jun 2017 20:37:14 +0000 (13:37 -0700)]
Move assist gestures settings to overlay
Bug:
37427306
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
Maurice Lam [Tue, 13 Jun 2017 21:50:20 +0000 (21:50 +0000)]
Merge "Allow skipping PIN setup screen"
jackqdyulei [Tue, 13 Jun 2017 21:48:51 +0000 (21:48 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
am:
d907b99d79
Change-Id: Icb92d38004bbbc109e7867638528bc7d80b9ac29
TreeHugger Robot [Tue, 13 Jun 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 00:43:29 +0000 (17:43 -0700)]
Add action active check for anomaly action.
This cl adds the action active check for the following actions:
1. ForceStopAction: check whether app is stopped
2. BackgroundActivityAction: check whether background activity
is turned on
If related action is not active, we won't report anomaly
to users. Future cl will add active check for bluetooth anomaly.
Bug:
62452014
Test: RunSettingsRoboTests
Change-Id: Ib490227f4570accf8ca4840a99bf85a022c42a5b
TreeHugger Robot [Tue, 13 Jun 2017 19:27:49 +0000 (19:27 +0000)]
Merge "ActivityPicker shouldn't grant permissions."
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
Alison Cichowlas [Tue, 13 Jun 2017 11:20:39 +0000 (11:20 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am:
39efd4ec44
am:
8421bc0d29
Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9
Alison Cichowlas [Tue, 13 Jun 2017 11:17:07 +0000 (11:17 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
am:
39efd4ec44
Change-Id: Ic059dc659f8e32a64c5fa018f48ce0470c64ccd8
Alison Cichowlas [Tue, 13 Jun 2017 11:08:32 +0000 (11:08 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
Katsiaryna Naliuka [Mon, 12 Jun 2017 15:37:33 +0000 (17:37 +0200)]
Added support for external tiles to the lockscreen activity
Bug:
62487664
Test: Built and flashed a system image.
Change-Id: I75e42a042f9212e247f02c5523979bcd5ea57baa
Bill Yi [Tue, 13 Jun 2017 09:54:32 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
42e494228b -s ours
am:
af27a8fd5b -s ours
Change-Id: Iec8c0e5e73100ebd98e09ac488684266796573b3
Bill Yi [Tue, 13 Jun 2017 09:51:01 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
42e494228b -s ours
Change-Id: Ia4b841e5b804c887d6c381d6d2e500a82509fac5
TreeHugger Robot [Tue, 13 Jun 2017 09:45:19 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 08:19:20 +0000 (08:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
am:
8315525c76 -s ours
Change-Id: Ib1cb17bc34c42d8510a6ae862f37da8496c7d175
Bill Yi [Tue, 13 Jun 2017 08:18:38 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
e637b663e8 -s ours
am:
52eb891200 -s ours
Change-Id: Ie74f6de413268659df89f43356ffbc6be208ec74
Android Build Merger (Role) [Tue, 13 Jun 2017 08:15:26 +0000 (08:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 08:15:09 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
0c2bb34f5c -s ours
Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57
Bill Yi [Tue, 13 Jun 2017 08:14:54 +0000 (08:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
e637b663e8 -s ours
Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I24da3a236478e91b06710a4065ba29663921f940
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 07:58:27 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Alison Cichowlas [Tue, 13 Jun 2017 03:04:40 +0000 (23:04 -0400)]
Fix build - fix import of SettingsRobolectricTestRunner.
Test: Only changing imports in test files.
Change-Id: Ib0d1433983da36416b979a0eaa1bb57419150374
Alison Cichowlas [Tue, 13 Jun 2017 03:04:08 +0000 (03:04 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833 am:
665384a8eb
am:
c8752ca07c
Change-Id: I0f0dcd3e02ada12e10459a17c7fe7777e66ce4b0
Alison Cichowlas [Tue, 13 Jun 2017 03:03:24 +0000 (03:03 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833 am:
0320d4e69f
am:
79f12ed51e -s ours
Change-Id: I536f9cf36eb0b1f9bd726b39359b4a9e1e6bc577
Alison Cichowlas [Tue, 13 Jun 2017 01:59:42 +0000 (01:59 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
665384a8eb
Change-Id: Iefb97be4d3c6a73c748347f37a25a4233a65aead
Alison Cichowlas [Tue, 13 Jun 2017 01:49:37 +0000 (01:49 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
0320d4e69f
Change-Id: Icc6ba97501c229ae8d5bf5a7169feae2af85f3a2
Alison Cichowlas [Tue, 13 Jun 2017 01:45:10 +0000 (01:45 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
Alison Cichowlas [Tue, 13 Jun 2017 01:41:39 +0000 (01:41 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Bill Yi [Tue, 13 Jun 2017 01:16:46 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7690f708e8eef5505a3508bbf7998d9638504920
Auto-generated-cl: translation import
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
Bill Yi [Tue, 13 Jun 2017 00:55:51 +0000 (17:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iacbdf7b56f66a2b58565ed9e693c7e1a1037d203
Auto-generated-cl: translation import
OSDN Git Service
