OSDN Git Service
Android Build Merger (Role) [Wed, 27 Apr 2016 13:51:01 +0000 (13:51 +0000)]
Merge "Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am:
e5103fe am:
0bc3442" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Wed, 27 Apr 2016 13:50:45 +0000 (13:50 +0000)]
Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am:
e5103fe
am:
0bc3442
* commit '
0bc3442d1fa51d15fe354a070818f46e9b301673':
Change-Id: I8a89f1a342915aeeab6000f1c37b61ae18f08050
Abodunrinwa Toki [Wed, 27 Apr 2016 13:50:43 +0000 (13:50 +0000)]
Merge "Make Settings dashboard items focusable." into nyc-dev am:
f7cd5bb
am:
478988a
* commit '
478988a7316c42dc76f8bf4f64674ce303b6ba26':
Make Settings dashboard items focusable.
Change-Id: I8d0d4fb1fd6871f46e59e1d49cac8937b97a645f
Abodunrinwa Toki [Wed, 27 Apr 2016 13:46:38 +0000 (13:46 +0000)]
Merge "Make Settings dashboard items focusable." into nyc-dev
am:
f7cd5bb
* commit '
f7cd5bb4da10363b1a839d617caa666d24f101c4':
Make Settings dashboard items focusable.
Change-Id: If3e074c38ac0763daaef83e6b0846e10a3f38739
Clara Bayarri [Wed, 27 Apr 2016 13:46:37 +0000 (13:46 +0000)]
Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am:
e5103fe
am:
95efca5
* commit '
95efca59700824194d32d51ca6fe00ad3ca8e6a6':
Fix SIM cards option displayed in RYU & N9 WiFi Settings
Change-Id: Ia7c75ec3f76f16212ca9b92234e0587e19f739b1
Clara Bayarri [Wed, 27 Apr 2016 13:41:48 +0000 (13:41 +0000)]
Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev
am:
e5103fe
* commit '
e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
Fix SIM cards option displayed in RYU & N9 WiFi Settings
Change-Id: I60eb53abf8fe6657717272f3ffd26f279298aac0
Clara Bayarri [Wed, 27 Apr 2016 13:41:48 +0000 (13:41 +0000)]
Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev
am:
e5103fe
* commit '
e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
Fix SIM cards option displayed in RYU & N9 WiFi Settings
Change-Id: I85379faeb5a701a0859bb7485774ff89f1ad4fca
Abodunrinwa Toki [Wed, 27 Apr 2016 13:41:00 +0000 (13:41 +0000)]
Merge "Make Settings dashboard items focusable." into nyc-dev
Clara Bayarri [Wed, 27 Apr 2016 13:34:15 +0000 (13:34 +0000)]
Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev
Clara Bayarri [Wed, 27 Apr 2016 11:33:56 +0000 (12:33 +0100)]
Fix SIM cards option displayed in RYU & N9 WiFi Settings
Same as previously with Developer Settings, the Settings main
activity uses PackageManager to disable options that shouldn't
show up. Since this has a delay, these options show up initially
and disappear after a refresh. Disabling them by default makes
them not show up at all for devices that won't have them, but in
exchange makes them not be visible until the first refresh for
devices that do have them.
A more complete fix would involve having a way to initially
not depend on PackageManager for option visibilities.
Bug:
28308433
Change-Id: I6f5c2151a45878fb6c69a9f9971c29ebe65d9d8a
Maurice Lam [Wed, 27 Apr 2016 01:20:18 +0000 (01:20 +0000)]
Merge "GLIF theme for settings" into nyc-mr1-dev
am:
203fbde
* commit '
203fbde10d652c10349052d645cf40a76b9d4198':
GLIF theme for settings
Change-Id: If1330a47f96fba74225e4f8fec8283537c3d5f19
Maurice Lam [Wed, 27 Apr 2016 01:10:43 +0000 (01:10 +0000)]
Merge "GLIF theme for settings" into nyc-mr1-dev
Maurice Lam [Fri, 22 Apr 2016 23:41:18 +0000 (16:41 -0700)]
GLIF theme for settings
Update fingerprint and screen lock setup to GLIF theme.
- Screen lock setup while in SUW
- Fingerprint setup, in and out of SUW
Bug:
26427729
Change-Id: I1063d3b54bbeea72de38bcc246cff368bc65945e
TreeHugger Robot [Tue, 26 Apr 2016 18:53:56 +0000 (18:53 +0000)]
Merge "Remove -night qualified resources" into nyc-dev am:
3602edf
am:
c42a680
* commit '
c42a6808e8d5a06935f1a38045431ab99bf495a4':
Change-Id: I9b20eb73828fbf5584dcfef07b5c43aab9b1a067
TreeHugger Robot [Tue, 26 Apr 2016 18:47:24 +0000 (18:47 +0000)]
Merge "Remove -night qualified resources" into nyc-dev am:
3602edf
am:
8802d69
* commit '
8802d693c7af6bbf5afed3951b207cbfeb1a0365':
Remove -night qualified resources
Change-Id: I0b02eeb578905c70288387aa3b7da4a7b34d7d13
Alan Viverette [Tue, 26 Apr 2016 18:44:10 +0000 (18:44 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
am:
3602edf
* commit '
3602edf29ef83dfe348bb16a14a5dccd8c61368e':
Remove -night qualified resources
Change-Id: I951817d2375f9e6e2180bc7e6e06d04b5ec54e99
Alan Viverette [Tue, 26 Apr 2016 18:44:05 +0000 (18:44 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
am:
3602edf
* commit '
3602edf29ef83dfe348bb16a14a5dccd8c61368e':
Remove -night qualified resources
Change-Id: Ifee7850fa18d436a7323685c1d94029c13a8d77e
TreeHugger Robot [Tue, 26 Apr 2016 18:33:03 +0000 (18:33 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
Julia Reynolds [Tue, 26 Apr 2016 15:48:50 +0000 (15:48 +0000)]
Merge "Don\'t crash on apps only installed for other users." into nyc-dev am:
1e5d0e7
am:
1c45384
* commit '
1c453847026eca1a0b51f2f8f98a1c33789af412':
Change-Id: Id58bdcd8091b86f24fa55eae18318eb1fb98ffab
Julia Reynolds [Tue, 26 Apr 2016 15:48:50 +0000 (15:48 +0000)]
Swap star tint. am:
e39066c
am:
39b1623
* commit '
39b162388b0eaa44756cdee59c618c0e6d69c057':
Change-Id: Ife04d87207e67198b2f2e95dc967a7ac06c85eda
Julia Reynolds [Tue, 26 Apr 2016 15:46:04 +0000 (15:46 +0000)]
Merge "Don\'t crash on apps only installed for other users." into nyc-dev am:
1e5d0e7
am:
7bcafc9
* commit '
7bcafc914f72b468f075e7b32aacaf202693f606':
Don't crash on apps only installed for other users.
Change-Id: I8810669770237ab9d26785298f4f31b7894d9550
Julia Reynolds [Tue, 26 Apr 2016 15:46:03 +0000 (15:46 +0000)]
Swap star tint. am:
e39066c
am:
31af251
* commit '
31af251c79935fc9b071b6b2b66ed7e0ca38b66d':
Swap star tint.
Change-Id: I36c408d0a5a93b1ba04c2edf19432cc6bc05d868
Julia Reynolds [Tue, 26 Apr 2016 15:40:45 +0000 (15:40 +0000)]
Merge "Don\'t crash on apps only installed for other users." into nyc-dev
am:
1e5d0e7
* commit '
1e5d0e731ededfb5ebf8e3d8073c292d26b17ce9':
Don't crash on apps only installed for other users.
Change-Id: I36a8014e263edcdad6b930056b44b257be4c3365
Julia Reynolds [Tue, 26 Apr 2016 15:40:45 +0000 (15:40 +0000)]
Swap star tint.
am:
e39066c
* commit '
e39066c30912bd027cd156c10ff4c9079144ea3d':
Swap star tint.
Change-Id: I570450b5c7ac7a6544e4e7c3899151f28fcdb035
Julia Reynolds [Tue, 26 Apr 2016 15:40:38 +0000 (15:40 +0000)]
Merge "Don\'t crash on apps only installed for other users." into nyc-dev
am:
1e5d0e7
* commit '
1e5d0e731ededfb5ebf8e3d8073c292d26b17ce9':
Don't crash on apps only installed for other users.
Change-Id: I5579fc7966954fd63c95bff57aad12ef03cc997b
Julia Reynolds [Tue, 26 Apr 2016 15:40:38 +0000 (15:40 +0000)]
Swap star tint.
am:
e39066c
* commit '
e39066c30912bd027cd156c10ff4c9079144ea3d':
Swap star tint.
Change-Id: If691ac08b89676b80eabdf8d0c845dd3f4d720e7
Julia Reynolds [Tue, 26 Apr 2016 15:28:19 +0000 (15:28 +0000)]
Merge "Don't crash on apps only installed for other users." into nyc-dev
Julia Reynolds [Tue, 26 Apr 2016 13:17:47 +0000 (09:17 -0400)]
Swap star tint.
Bug:
27558254
Change-Id: Iedcc61f326813047b50b1d68b4e82ac08ede5623
Julia Reynolds [Mon, 25 Apr 2016 20:45:49 +0000 (16:45 -0400)]
Don't crash on apps only installed for other users.
Change-Id: I13d415441aa1c7d09df7adccd4e2d2f9bbd3dbfb
Fixes:
28151314
Daniel Sandler [Mon, 25 Apr 2016 19:34:16 +0000 (19:34 +0000)]
Merge changes from topic \'qs-tiles\' into nyc-dev am:
321d450
am:
60b8a7b
* commit '
60b8a7bde8bde094822d07852f4d0eaab52f9c7f':
Change-Id: I67aa3451e8d31dff36ffa29bf146984b730212f2
Daniel Sandler [Mon, 25 Apr 2016 19:33:38 +0000 (19:33 +0000)]
Merge changes from topic \'qs-tiles\' into nyc-dev am:
321d450
am:
60a2e4d
* commit '
60a2e4d0167300a2f0c06f10b5600386f488c482':
Developer QS tile: GPU Profiling.
Developer QS tile: Show Layout.
Change-Id: I40be4a1719f1644e2db1327c32962ff466710d9f
Dan Sandler [Mon, 25 Apr 2016 19:28:22 +0000 (19:28 +0000)]
Merge changes from topic \'qs-tiles\' into nyc-dev
am:
321d450
* commit '
321d45031bd93e05ffba4c8aedbac5dc41436bae':
Developer QS tile: GPU Profiling.
Developer QS tile: Show Layout.
Change-Id: I96b3eb012d3663d1c517aa53976a7ffd70d67c60
Dan Sandler [Mon, 25 Apr 2016 19:28:22 +0000 (19:28 +0000)]
Merge changes from topic \'qs-tiles\' into nyc-dev
am:
321d450
* commit '
321d45031bd93e05ffba4c8aedbac5dc41436bae':
Developer QS tile: GPU Profiling.
Developer QS tile: Show Layout.
Change-Id: If324b5436e9ee90b53a3a918174abdd403dd669d
Daniel Sandler [Mon, 25 Apr 2016 19:21:24 +0000 (19:21 +0000)]
Merge changes from topic 'qs-tiles' into nyc-dev
* changes:
Developer QS tile: GPU Profiling.
Developer QS tile: Show Layout.
Tony Mak [Mon, 25 Apr 2016 17:21:40 +0000 (17:21 +0000)]
Merge "Update string for work challenge" into nyc-dev am:
6b9aa35
am:
185bfdf
* commit '
185bfdf3a57beb1e22e734a1095dacfb8307bf94':
Change-Id: Ifa27ac999b9fe4b879e373716b9aede1c730f8c4
Tony Mak [Mon, 25 Apr 2016 17:15:28 +0000 (17:15 +0000)]
Merge "Update string for work challenge" into nyc-dev am:
6b9aa35
am:
f39379e
* commit '
f39379e9edd9b2f50f9e3ff76dcf95025f47a48b':
Update string for work challenge
Change-Id: Id477b96895a9fe20e299b480b6dfeeb1346d9e30
Alan Viverette [Mon, 25 Apr 2016 16:55:40 +0000 (12:55 -0400)]
Remove -night qualified resources
Bug:
28358465
Change-Id: I276076b35eb946e600b4540c184fc0605d73f7db
Abodunrinwa Toki [Mon, 25 Apr 2016 16:21:03 +0000 (17:21 +0100)]
Make Settings dashboard items focusable.
Bug:
27038246
Change-Id: Ied76fc546cacf1dafa4744dfc6e229f249a209d3
Tony Mak [Mon, 25 Apr 2016 15:52:52 +0000 (15:52 +0000)]
Merge "Update string for work challenge" into nyc-dev
am:
6b9aa35
* commit '
6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
Update string for work challenge
Change-Id: I18d307f4aea958fba7d95c630e15016ac6031814
Tony Mak [Mon, 25 Apr 2016 15:52:51 +0000 (15:52 +0000)]
Merge "Update string for work challenge" into nyc-dev
am:
6b9aa35
* commit '
6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
Update string for work challenge
Change-Id: Idf773961a3be23573c93fcd50186beaf6f6ce86c
Tony Mak [Mon, 25 Apr 2016 15:36:03 +0000 (15:36 +0000)]
Merge "Update string for work challenge" into nyc-dev
Ricky Wai [Mon, 25 Apr 2016 13:29:51 +0000 (13:29 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am:
0858ce1
am:
a4cacbd
* commit '
a4cacbd7dca4a4bf8f7967b5365922dc5737cf93':
Change-Id: Icc784e1fe3236a2cbc9944861196f8479bddf1c9
Ricky Wai [Mon, 25 Apr 2016 13:27:24 +0000 (13:27 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am:
0858ce1
am:
3f29124
* commit '
3f291245a8dbb6a429646e8fcf36fa91fbbc3fd9':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: I87053df8f8f98803686a265c01bd7bf8f4f64337
Ricky Wai [Mon, 25 Apr 2016 13:23:05 +0000 (13:23 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am:
0858ce1
* commit '
0858ce1488b7cd916b565956b7c0bcc8a699ab27':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: If1d5da67189a8eae98769c1f0c859c5d8e8d5290
Ricky Wai [Mon, 25 Apr 2016 13:23:03 +0000 (13:23 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am:
0858ce1
* commit '
0858ce1488b7cd916b565956b7c0bcc8a699ab27':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: Idb75d79eacebbdced021c1b96d73357b0e54a281
Bill Yi [Mon, 25 Apr 2016 13:20:19 +0000 (13:20 +0000)]
Import translations. DO NOT MERGE am:
af3dce8 -s ours
am:
cfc670c -s ours
* commit '
cfc670c45425852e053e54f6860fc4b4f91715d5':
Change-Id: I56ca768880986cc3e15752d280839d5abe730129
Bill Yi [Mon, 25 Apr 2016 13:14:30 +0000 (13:14 +0000)]
Import translations. DO NOT MERGE am:
af3dce8 -s ours
am:
a66bc31 -s ours
* commit '
a66bc31cc4023d033a49287b8cc2cde795739300':
Import translations. DO NOT MERGE
Change-Id: Ie9a50ae981d4d923310dfd83d64dfba4e314e8ae
Ricky Wai [Mon, 25 Apr 2016 13:11:44 +0000 (13:11 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 13:09:23 +0000 (13:09 +0000)]
Import translations. DO NOT MERGE
am:
af3dce8 -s ours
* commit '
af3dce8ce599f53a731838f6da12f233081bdd1e':
Import translations. DO NOT MERGE
Change-Id: I25f78795faa2a8d4db43fe3146e2bd66bf0d6731
Bill Yi [Mon, 25 Apr 2016 13:09:19 +0000 (13:09 +0000)]
Import translations. DO NOT MERGE
am:
af3dce8 -s ours
* commit '
af3dce8ce599f53a731838f6da12f233081bdd1e':
Import translations. DO NOT MERGE
Change-Id: I1e45f679fccd258dd6c788bbedcf8d827b75f1a1
Bill Yi [Mon, 25 Apr 2016 05:35:45 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I120bc8d7a5dfc7c7f9807c57862be80699ed1ada
Auto-generated-cl: translation import
Dan Sandler [Mon, 28 Mar 2016 15:13:40 +0000 (11:13 -0400)]
Developer QS tile: GPU Profiling.
Bug:
27872042
Change-Id: Ia57005df15572b1714af2a3a8cd5b9794fdfb165
Dan Sandler [Thu, 24 Mar 2016 17:24:27 +0000 (10:24 -0700)]
Developer QS tile: Show Layout.
Bug:
27872042
Change-Id: I0df2ffecbf7d2682d89c9b8343590bb04bcc305c
Android Build Merger (Role) [Fri, 22 Apr 2016 23:33:23 +0000 (23:33 +0000)]
Merge "Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am:
c8d363e am:
4143228" into nyc-mr1-dev-plus-aosp
Svetoslav Ganov [Fri, 22 Apr 2016 23:33:16 +0000 (23:33 +0000)]
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am:
c8d363e
am:
4143228
* commit '
4143228b47c12806865b156f261a85bd0d8e9c4e':
Cleanup of the PackageInstaller API - Settings
Change-Id: I166da8b6a052e5899c2d7e94e96a942979293e43
Svetoslav Ganov [Fri, 22 Apr 2016 23:33:13 +0000 (23:33 +0000)]
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am:
c8d363e
am:
5658e57
* commit '
5658e577f3ddb544745b5f73e53cb6e4f3a58200':
Cleanup of the PackageInstaller API - Settings
Change-Id: I5a688a15ef742a6d7ec3300cc67d17be761ae426
Svetoslav Ganov [Fri, 22 Apr 2016 23:30:39 +0000 (23:30 +0000)]
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
am:
c8d363e
* commit '
c8d363e24c4906f2a9d261d46503f16b4b63bccd':
Cleanup of the PackageInstaller API - Settings
Change-Id: Ie4352dff2c554c760a78b8d071ffaf29b3720e2a
Svetoslav Ganov [Fri, 22 Apr 2016 23:30:38 +0000 (23:30 +0000)]
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
am:
c8d363e
* commit '
c8d363e24c4906f2a9d261d46503f16b4b63bccd':
Cleanup of the PackageInstaller API - Settings
Change-Id: I67ea31a2464101d25b6d80b4b84dad596738e829
Svetoslav Ganov [Fri, 22 Apr 2016 22:18:27 +0000 (22:18 +0000)]
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Disable tethering when Data Saver mode is on." into nyc-dev am:
1d3f1e0
am:
cd57db7
* commit '
cd57db78b051ebee2509d26253bf7c4954c85f18':
Change-Id: I2b4998ecbd61ba84502ffb85f09a4cb311c19447
Felipe Leme [Fri, 22 Apr 2016 21:46:21 +0000 (21:46 +0000)]
Merge "Disable tethering when Data Saver mode is on." into nyc-dev am:
1d3f1e0
am:
06fb22d
* commit '
06fb22dd19017439849625a88f57e741dfd5ad46':
Disable tethering when Data Saver mode is on.
Change-Id: Iadff2074da9d7f04b51292c7ed33c20d96ada623
Felipe Leme [Fri, 22 Apr 2016 21:43:50 +0000 (21:43 +0000)]
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
am:
1d3f1e0
* commit '
1d3f1e0fde8538ba0edd54009931edd48c097fe0':
Disable tethering when Data Saver mode is on.
Change-Id: I8d8f59aa6726c4e47f0b7ed26400645ce1e97d6c
Felipe Leme [Fri, 22 Apr 2016 21:43:50 +0000 (21:43 +0000)]
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
am:
1d3f1e0
* commit '
1d3f1e0fde8538ba0edd54009931edd48c097fe0':
Disable tethering when Data Saver mode is on.
Change-Id: I6de8bec1c969a1fe7a1d1b8bf5d8587d2c0fc6f1
Felipe Leme [Fri, 22 Apr 2016 21:39:51 +0000 (21:39 +0000)]
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 00:17:28 +0000 (17:17 -0700)]
Disable tethering when Data Saver mode is on.
BUG:
28313291
Change-Id: Idbedd440a1baa41f1407b32e86f5ae0080e60798
Philip P. Moltmann [Fri, 22 Apr 2016 18:54:02 +0000 (18:54 +0000)]
Merge "Update print jobs appropriately in the print settings." into nyc-dev am:
badb762
am:
558c541
* commit '
558c541f05443620b5b4a7032502b360cf44d84c':
Change-Id: If23cb8a2de630cf09f730ff9b39f2efb96743b1c
Philip P. Moltmann [Fri, 22 Apr 2016 18:49:01 +0000 (18:49 +0000)]
Merge "Update print jobs appropriately in the print settings." into nyc-dev am:
badb762
am:
04b28dd
* commit '
04b28dde9bf983bc7c0b6ee3f878d6148ad54eee':
Update print jobs appropriately in the print settings.
Change-Id: I70ec2fd543967a906e01fc34a0f93c909fb4a906
Philip P. Moltmann [Fri, 22 Apr 2016 18:41:29 +0000 (18:41 +0000)]
Merge "Update print jobs appropriately in the print settings." into nyc-dev
am:
badb762
* commit '
badb762523ae7cebf6db98f5a590f403893a7d99':
Update print jobs appropriately in the print settings.
Change-Id: Ib1eb53c336d63543333d83fc25cfd55fac1f6bfb
Philip P. Moltmann [Fri, 22 Apr 2016 18:41:12 +0000 (18:41 +0000)]
Merge "Update print jobs appropriately in the print settings." into nyc-dev
am:
badb762
* commit '
badb762523ae7cebf6db98f5a590f403893a7d99':
Update print jobs appropriately in the print settings.
Change-Id: Ie353c3ed8956fe8587de16db4e30be6a318a016b
Daniel Nishi [Fri, 22 Apr 2016 17:34:44 +0000 (17:34 +0000)]
Fix a whitespace issue in ManageApplications.
am:
9412c5a6e2
* commit '
9412c5a6e24092ac5ae23e000bf1ae3c1455df11':
Fix a whitespace issue in ManageApplications.
Change-Id: I585eaa6bde12eb70f3150c11fc0ffcee4f5909f2
Philip P. Moltmann [Fri, 22 Apr 2016 17:32:36 +0000 (17:32 +0000)]
Merge "Update print jobs appropriately in the print settings." into nyc-dev
Tony Mak [Fri, 22 Apr 2016 17:30:49 +0000 (18:30 +0100)]
Update string for work challenge
Also, increase the char limit to 100.
Change-Id: I2d896a0d942767ec949bc235b16c824e0c6f80c7
Fix:
28204828
Daniel Nishi [Wed, 20 Apr 2016 20:40:18 +0000 (13:40 -0700)]
Fix a whitespace issue in ManageApplications.
Change-Id: I730d9737f801dfb29172e71fc5f32a310b8e0cc4
(cherry picked from commit
cce1a3189a7e03aea7e4d5e2e35ae0a3bc76dd52)
Robin Lee [Fri, 22 Apr 2016 16:12:00 +0000 (16:12 +0000)]
Merge "Change VPN failure notification to dialog" into nyc-dev am:
dc1e59a314
am:
2bffd33441
* commit '
2bffd3344108c98bae072a4e2702905d76bcb295':
Change-Id: I4b984e325d9b5af67637cf0de14e3af3c12351f1
Jason Monk [Fri, 22 Apr 2016 16:12:00 +0000 (16:12 +0000)]
Merge "Increase secondary text contrast on conditionals" into nyc-dev am:
7e61f71bcc
am:
182abfa24f
* commit '
182abfa24f44ed9242815397de2d011f0ac52d4c':
Change-Id: If2e77c7ea6ce426e955dc71fd25d351866d8403a
Jason Monk [Fri, 22 Apr 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Attempt to fix receiver registering problems" into nyc-dev am:
8dbc166353
am:
762f0e137c
* commit '
762f0e137c350ab5de3a663e1a20bdc790703b76':
Change-Id: I6dd6c35844cfe32843f64cb3302da058bbb8ac7d
Jason Monk [Fri, 22 Apr 2016 16:11:58 +0000 (16:11 +0000)]
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am:
af6236d06f
am:
700da14d84
* commit '
700da14d84deea6c6396ee40a324d8b3c4aa6118':
Change-Id: Idd6d22440f0863fcb30663114ab07ac08a4a9303
Robin Lee [Fri, 22 Apr 2016 16:11:07 +0000 (16:11 +0000)]
Merge "Change VPN failure notification to dialog" into nyc-dev am:
dc1e59a314
am:
c9bc607505
* commit '
c9bc6075055e99f09c4b8d638ccf00ee279ed5a3':
Change VPN failure notification to dialog
Change-Id: I88ab3523a9f98e44e7c356e60ef989e432efa88e
Jason Monk [Fri, 22 Apr 2016 16:11:06 +0000 (16:11 +0000)]
Merge "Increase secondary text contrast on conditionals" into nyc-dev am:
7e61f71bcc
am:
edc7f834ac
* commit '
edc7f834ac58950875313d9704c0e778a5a90095':
Increase secondary text contrast on conditionals
Change-Id: I862b6003c6acb637020652951376d80b718c4bc4
Jason Monk [Fri, 22 Apr 2016 16:11:06 +0000 (16:11 +0000)]
Merge "Attempt to fix receiver registering problems" into nyc-dev am:
8dbc166353
am:
5fddbcd846
* commit '
5fddbcd846aefdd875b6dd7709d3724591cba06d':
Attempt to fix receiver registering problems
Change-Id: Ib861c6aef14a2235008d40509cb95b2410f1b069
Jason Monk [Fri, 22 Apr 2016 16:11:05 +0000 (16:11 +0000)]
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am:
af6236d06f
am:
7014023f5d
* commit '
7014023f5d291b6bebc0601dd221934c89143716':
Don't link to MobileNetworkSettings unless admin user
Change-Id: I874d3910be0b1c808ab63f6fa9e9dda1a0731a47
Robin Lee [Fri, 22 Apr 2016 16:08:56 +0000 (16:08 +0000)]
Merge "Change VPN failure notification to dialog" into nyc-dev
am:
dc1e59a314
* commit '
dc1e59a3147dfef7c582f2881e25d504025baa6a':
Change VPN failure notification to dialog
Change-Id: I9209c010bd1bf3d0d7b18bef32c05b302354494f
Jason Monk [Fri, 22 Apr 2016 16:08:56 +0000 (16:08 +0000)]
Merge "Increase secondary text contrast on conditionals" into nyc-dev
am:
7e61f71bcc
* commit '
7e61f71bccee2c3d064e9ce30b9b4a26839db49b':
Increase secondary text contrast on conditionals
Change-Id: I80e4536dab43a38dc70b6766ce1a0c433dba00a6
Jason Monk [Fri, 22 Apr 2016 16:08:55 +0000 (16:08 +0000)]
Merge "Attempt to fix receiver registering problems" into nyc-dev
am:
8dbc166353
* commit '
8dbc16635341e7c52454d3faf806dc228502f265':
Attempt to fix receiver registering problems
Change-Id: I36fd2eba3c451a3c509ea0e5da9611a91af239e6
Jason Monk [Fri, 22 Apr 2016 16:08:55 +0000 (16:08 +0000)]
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am:
af6236d06f
* commit '
af6236d06f1be85bc52e04e9cad8478035a677ab':
Don't link to MobileNetworkSettings unless admin user
Change-Id: I627072a521c4633abe6f2493ff641aea78ad5b86
Robin Lee [Fri, 22 Apr 2016 16:08:54 +0000 (16:08 +0000)]
Merge "Change VPN failure notification to dialog" into nyc-dev
am:
dc1e59a314
* commit '
dc1e59a3147dfef7c582f2881e25d504025baa6a':
Change VPN failure notification to dialog
Change-Id: I15d01551a3f941a6061c371bde6210ee8df89428
Jason Monk [Fri, 22 Apr 2016 16:08:53 +0000 (16:08 +0000)]
Merge "Increase secondary text contrast on conditionals" into nyc-dev
am:
7e61f71bcc
* commit '
7e61f71bccee2c3d064e9ce30b9b4a26839db49b':
Increase secondary text contrast on conditionals
Change-Id: I0e7ab0ce20c0e08f214b8bf9a2bae59bc7d374e9
Jason Monk [Fri, 22 Apr 2016 16:08:53 +0000 (16:08 +0000)]
Merge "Attempt to fix receiver registering problems" into nyc-dev
am:
8dbc166353
* commit '
8dbc16635341e7c52454d3faf806dc228502f265':
Attempt to fix receiver registering problems
Change-Id: Ief3d38f0a8ad3ebe6df95efd380e737f48af2a87
Jason Monk [Fri, 22 Apr 2016 16:08:52 +0000 (16:08 +0000)]
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am:
af6236d06f
* commit '
af6236d06f1be85bc52e04e9cad8478035a677ab':
Don't link to MobileNetworkSettings unless admin user
Change-Id: I1f2f8772015145bf418472f6389ea2d8f8533601
Robin Lee [Fri, 22 Apr 2016 16:00:14 +0000 (16:00 +0000)]
Merge "Change VPN failure notification to dialog" into nyc-dev
Jason Monk [Fri, 22 Apr 2016 15:47:47 +0000 (15:47 +0000)]
Merge "Increase secondary text contrast on conditionals" into nyc-dev
Jason Monk [Fri, 22 Apr 2016 15:47:44 +0000 (15:47 +0000)]
Merge "Attempt to fix receiver registering problems" into nyc-dev
Jason Monk [Fri, 22 Apr 2016 15:47:39 +0000 (15:47 +0000)]
Merge "Don't link to MobileNetworkSettings unless admin user" into nyc-dev
Jason Monk [Fri, 22 Apr 2016 15:19:52 +0000 (11:19 -0400)]
Attempt to fix receiver registering problems
When in doubt, post to main thread.
Also clean up the listening state just in case there were any
doubts about it.
Change-Id: I9ab85781f38b0f694dc46ed5a953506ef10c5778
Fixes:
28319383 (Fingers crossed)
Android Build Merger (Role) [Fri, 22 Apr 2016 14:53:10 +0000 (14:53 +0000)]
Merge "Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am:
65515931e9 am:
6081857cea" into nyc-mr1-dev-plus-aosp
Mihai Niță [Fri, 22 Apr 2016 14:53:03 +0000 (14:53 +0000)]
Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am:
65515931e9
am:
6081857cea
* commit '
6081857ceaa376b15f1b23ee2b458ccb46715c20':
Change-Id: Iaea76941ee5b8323c18df5a469b6b1a8d7000ed3
Android Build Merger (Role) [Fri, 22 Apr 2016 14:52:25 +0000 (14:52 +0000)]
Merge "Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am:
65515931e9 am:
6081857cea" into nyc-mr1-dev-plus-aosp
Mihai Niță [Fri, 22 Apr 2016 14:52:16 +0000 (14:52 +0000)]
Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am:
65515931e9
am:
6081857cea
* commit '
6081857ceaa376b15f1b23ee2b458ccb46715c20':
Add accessibility actions to the drag-and-drop locale list
Change-Id: Ie2fa7a2d6d89e65078bcd37c5a5baf73a704c0b0
Mihai Niță [Fri, 22 Apr 2016 14:52:15 +0000 (14:52 +0000)]
Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am:
65515931e9
am:
691899e029
* commit '
691899e029736f26d26d0209b9ea4fd0390b64f2':
Add accessibility actions to the drag-and-drop locale list
Change-Id: Icf01017bdc56d3aa8249af3efa84340fc815d7c8
Mihai Nita [Fri, 22 Apr 2016 14:49:55 +0000 (14:49 +0000)]
Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev
am:
65515931e9
* commit '
65515931e98341e17cf6207b363dbe3f4399fcfd':
Add accessibility actions to the drag-and-drop locale list
Change-Id: I8726a6ce617f2c3347b00bc7ac857fd1ba8f7b47
OSDN Git Service
