OSDN Git Service
Fan Zhang [Mon, 19 Jun 2017 14:54:00 +0000 (14:54 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7
am:
8d62516e89 -s ours
Change-Id: I64db01eb7d3d9f2fd6e951383b62f79032c7f9e4
Fan Zhang [Mon, 19 Jun 2017 14:53:02 +0000 (14:53 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7 -s ours
am:
c15dd4ee9b -s ours
Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e
Fan Zhang [Mon, 19 Jun 2017 14:47:34 +0000 (14:47 +0000)]
Merge "Misc fixes for notification" into oc-dev
am:
e3f322dfc7
Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
Fan Zhang [Mon, 19 Jun 2017 14:47:33 +0000 (14:47 +0000)]
Merge "Misc fixes for notification" into oc-dev
am:
e3f322dfc7 -s ours
Change-Id: Ifef5d6fe32b61837fb03285cdc46744954b246ad
TreeHugger Robot [Mon, 19 Jun 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Misc fixes for notification" into oc-dev
Bill Yi [Sat, 17 Jun 2017 06:25:30 +0000 (06:25 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours
am:
3d6acb722c -s ours
Change-Id: I6504b98738a17e027a7fb77dbdbdce4b8fa8fa6a
Bill Yi [Sat, 17 Jun 2017 06:16:44 +0000 (06:16 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours
am:
a09c96c1a5 -s ours
Change-Id: If4cd48f7385e36f9473e171824e7fe96c63ab338
Bill Yi [Sat, 17 Jun 2017 06:14:17 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: Iac1be0f9462447d5935664f5f111a2d721237436
Bill Yi [Sat, 17 Jun 2017 06:14:14 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: I068211d35ea2f411c996daa834d09c49db78b80a
Bill Yi [Sat, 17 Jun 2017 06:07:14 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
fa8fa0d212 -s ours
Change-Id: I44db74c9ae9d6b236ee4f068dac9fdcfd190c3e0
TreeHugger Robot [Sat, 17 Jun 2017 06:00:19 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Sat, 17 Jun 2017 00:50:49 +0000 (00:50 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
am:
9b4bb95e82
Change-Id: Ie9d8419b88c3bb97eca24e6037c8e46ab8fc8489
TreeHugger Robot [Sat, 17 Jun 2017 00:41:22 +0000 (00:41 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
Maurice Lam [Sat, 17 Jun 2017 00:20:54 +0000 (00:20 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
am:
2b836b0c0c
Change-Id: I8229328b2d1ab55c76cf939b55d8528f511dfcda
TreeHugger Robot [Sat, 17 Jun 2017 00:07:38 +0000 (00:07 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit
5d811c40d3d1cdb5dfa8eada42329f612d8fbff9)
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Misc fixes for notification
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header
Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix:
62138362
Fix:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
Maurice Lam [Fri, 16 Jun 2017 22:17:18 +0000 (22:17 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
am:
98a9d341c8
Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
TreeHugger Robot [Fri, 16 Jun 2017 22:08:04 +0000 (22:08 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
Lei Yu [Fri, 16 Jun 2017 20:52:09 +0000 (20:52 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev
am:
e2530c2f62
Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55
Lei Yu [Fri, 16 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 03:17:18 +0000 (20:17 -0700)]
Make Accessibility settings a SUW suggestion
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug:
38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
Maurice Lam [Mon, 12 Jun 2017 19:15:40 +0000 (12:15 -0700)]
Make confirm lock screen use the right theme
Test: cd tests/robotests && mma
Bug:
62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
Shinji Sogo [Fri, 16 Jun 2017 19:06:38 +0000 (19:06 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am:
cd1f7a3146 am:
27ca1272a5
am:
879fd4b406
Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
Shinji Sogo [Fri, 16 Jun 2017 19:00:18 +0000 (19:00 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am:
cd1f7a3146
am:
27ca1272a5
Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
Shinji Sogo [Fri, 16 Jun 2017 18:53:50 +0000 (18:53 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am:
cd1f7a3146
Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
Treehugger Robot [Fri, 16 Jun 2017 18:41:39 +0000 (18:41 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
Lei Yu [Fri, 16 Jun 2017 17:06:37 +0000 (17:06 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
am:
b275471725
Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
Lei Yu [Fri, 16 Jun 2017 16:55:52 +0000 (16:55 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
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
Bill Yi [Fri, 16 Jun 2017 14:12:33 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
Bill Yi [Fri, 16 Jun 2017 14:00:00 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
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: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
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: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
Maurice Lam [Fri, 16 Jun 2017 01:15:20 +0000 (01:15 +0000)]
Allow skipping PIN setup screen
am:
4c930fc2d5
Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
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
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
jackqdyulei [Thu, 15 Jun 2017 17:18:00 +0000 (10:18 -0700)]
Update wakelock detector
1. Use new API: getSubTimer().getTotalDurationMsLocked(), which returns
the wakelock running time in the background.
2. Add code to detect whether app is currently holding wakelocks, by
using API: getCurrentDurationMsLocked
Bug:
38233034
Test: RunSettingsRoboTests
Change-Id: If69b751acf5741ff8df2c905642c008a0a2b32e6
jackqdyulei [Tue, 13 Jun 2017 17:17:59 +0000 (10:17 -0700)]
Display anomaly in battery usage page
This cl adds a new parameter, mAnomalies, for
AdvancedPowerUsageDetail.
If it is null, fragment will start AnomalyLoader to detect anomaly.
If not null, just display the anomaly.
Bug:
36925180
Test: RunSettingsRoboTests
Change-Id: I572bc5954c1cdb210d18b6dbe1ab9dba25c0a61f
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
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: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
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:06:44 +0000 (00:06 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
am:
fc9622ef53
Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
TreeHugger Robot [Tue, 13 Jun 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
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
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
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
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: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
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
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 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
Tarandeep Singh [Mon, 12 Jun 2017 22:32:28 +0000 (15:32 -0700)]
Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput
Both View focus (which is triggered by View.requestFocus()) and IME focus
(which is internally handled inside InputMethodManager), are implemented
as delayed tasks on the UI thread. The goal here is to make sure that
InputMethodManager.showSoftInput() always gets called only after the target
EditText gained IME focus.
This requires some tricks, but is basically a solved problem with
ImeAwareEditText introduced by
I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235. Here we can just reuse it.
Note that ConfirmLockPassword & ChooseLockPassword are the only ones
using ScrollToParentEditText. Latter doesn't call IMM.showSoftInput().
Fixes:
62542157
Test: Verified keyboard still shows-up on the ConfirmLock screen.
Change-Id: I892d639f3cc5d43db553b682d5278b8ce2fe72da
Salvador Martinez [Tue, 13 Jun 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
am:
34373c8f33
Change-Id: I4a3d05aade72fc2de50a8fc6df574d8073bdafd6
TreeHugger Robot [Tue, 13 Jun 2017 00:13:43 +0000 (00:13 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Tarandeep Singh [Mon, 12 Jun 2017 22:33:08 +0000 (22:33 +0000)]
Fix keyboard not launching on screen lock settings.
am:
86b8f4460d
Change-Id: I21b872ac9edacd625c0995b9c878cbe91f82cc2b
Tarandeep Singh [Fri, 9 Jun 2017 23:24:14 +0000 (16:24 -0700)]
Fix keyboard not launching on screen lock settings.
calling requestFocus() on EditText fixes the issue.
Bug:
62344628
Test: manual
Change-Id: If8321cb646dca5882d5a44bd1ec2f66f0f4ec5aa
Maurice Lam [Mon, 12 Jun 2017 18:38:52 +0000 (18:38 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
am:
cd2cb4511a
Change-Id: I96a2e76f42d2972eaa2542c7d4d94a728c48ead2
Maurice Lam [Mon, 12 Jun 2017 18:34:31 +0000 (18:34 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
Salvador Martinez [Mon, 12 Jun 2017 18:08:56 +0000 (11:08 -0700)]
Increase length of string for pref title
Translators needed a few more characters in a preference that still
had ample space. This cl simply changes the comment to allow for
the requested character count.
Test: Ensure 25 chars fit (screenshot)
Bug:
62433109
Change-Id: I1bd31c969cc4fea8bcfec794a2d8a7b98778853c