Xiyuan Xia
116eafd323
am e383bc22: am 491a6b13: am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
...
* commit 'e383bc224810fa6e23ed8541011851df7f891d18':
Do not show soft keyboard when locked out
2015-05-21 18:59:03 +00:00
Jason Monk
34eb979fbd
am 8289996d: am 939ee559: am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
...
* commit '8289996dfb6077322fc6914ba13a18cda11a92ee':
Remove data item from app info when not supported
2015-05-21 18:59:01 +00:00
Xiyuan Xia
e383bc2248
am 491a6b13: am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
...
* commit '491a6b13892b6ddc9271ad063ea8b4773b08b924':
Do not show soft keyboard when locked out
2015-05-21 18:48:03 +00:00
Jason Monk
8289996dfb
am 939ee559: am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
...
* commit '939ee55954b5f8cd4328de8b761385321f2fd773':
Remove data item from app info when not supported
2015-05-21 18:43:22 +00:00
Xiyuan Xia
491a6b1389
am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
...
* commit 'a0e052b17b0c730dcd61ad2787c041c75107f106':
Do not show soft keyboard when locked out
2015-05-21 16:22:30 +00:00
Xiyuan Xia
a0e052b17b
Merge "Do not show soft keyboard when locked out" into mnc-dev
2015-05-21 16:16:07 +00:00
Geoff Mendal
f25b03a4f3
am 5fdab45f: (-s ours) am e008b99d: (-s ours) am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '5fdab45f4019b0b333b4ff96715f4a2ffbed1a6a':
Import translations. DO NOT MERGE
2015-05-21 15:52:28 +00:00
John Spurlock
8f58b0cb2f
am cf12b49e: am 8b9dbbe0: am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
...
* commit 'cf12b49e51c29c1f01db376222d8bfb3b18701e2':
Settings: Auto-capitalize edit text for zen autorule names.
2015-05-21 15:52:27 +00:00
Geoff Mendal
5fdab45f40
am e008b99d: (-s ours) am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e008b99d447cad4bc59ae645f48a03b92d336f45':
Import translations. DO NOT MERGE
2015-05-21 15:39:22 +00:00
John Spurlock
cf12b49e51
am 8b9dbbe0: am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
...
* commit '8b9dbbe0c82a196b8f3d886db59b108f5becddeb':
Settings: Auto-capitalize edit text for zen autorule names.
2015-05-21 15:39:21 +00:00
Geoff Mendal
111269eff7
Import translations. DO NOT MERGE
...
Change-Id: Iccc7a50005ff72486028fc77cb04d51cc1474a13
Auto-generated-cl: translation import
2015-05-21 07:12:14 -07:00
Jason Monk
939ee55954
am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
...
* commit 'b2e07cd0f9e2a869710c6b713f403afc4fbdbfab':
Remove data item from app info when not supported
2015-05-21 13:05:57 +00:00
Jason Monk
b2e07cd0f9
Merge "Remove data item from app info when not supported" into mnc-dev
2015-05-21 12:55:31 +00:00
Jason Monk
b45e27bc0f
Remove data item from app info when not supported
...
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
2015-05-21 08:43:25 -04:00
Geoff Mendal
e008b99d44
am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '462e70083fbdd12da55b6a6b98a59750d250f40d':
Import translations. DO NOT MERGE
2015-05-21 03:30:37 +00:00
John Spurlock
8b9dbbe0c8
am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
...
* commit 'fffa7f905b809659c3edbbb1663f3a74ce5625bc':
Settings: Auto-capitalize edit text for zen autorule names.
2015-05-21 03:30:36 +00:00
Geoff Mendal
462e70083f
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-21 03:26:57 +00:00
Geoff Mendal
bcb20a9f52
Import translations. DO NOT MERGE
...
Change-Id: Ibf8eea922fe4322ec29f6837bfb399c85b4cfbcf
Auto-generated-cl: translation import
2015-05-20 20:20:56 -07:00
John Spurlock
fffa7f905b
Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
2015-05-21 03:19:20 +00:00
John Spurlock
b3d2f08e24
Settings: Auto-capitalize edit text for zen autorule names.
...
Bug: 21337479
Change-Id: I424adf94a0717cb4ca75576e2047cbaf387bb947
2015-05-20 23:14:49 -04:00
Fyodor Kupolov
bd188ea550
am b7d361af: am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings"
...
* commit 'b7d361af0f53ae36ea672491bce6c04a6c45aeda':
Added SearchIndexProvider for UserSettings
2015-05-21 00:37:28 +00:00
Fyodor Kupolov
b7d361af0f
am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings"
...
* commit 'b995c78fbbbab8060e5101fb1bee03adf509a786':
Added SearchIndexProvider for UserSettings
2015-05-21 00:28:46 +00:00
Fyodor Kupolov
b995c78fbb
Merge "Added SearchIndexProvider for UserSettings"
2015-05-20 23:40:50 +00:00
Sean Francis-Lyon
d2e31fd9eb
Merge "removing google specific language from aosp strings"
2015-05-20 23:22:48 +00:00
Xiyuan Xia
4a8edaf8b0
Do not show soft keyboard when locked out
...
- Remove stateVisible for ConfirmLockPassword activity so that
soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
activity window gains focus;
Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
2015-05-20 14:43:36 -07:00
Fyodor Kupolov
580e2e7ce1
Added SearchIndexProvider for UserSettings
...
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.
Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
2015-05-20 14:23:52 -07:00
Jorim Jaggi
4a347caa72
am 4d1e3862: am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
...
* commit '4d1e3862c29bd0600179468ca6f7149767f53ab6':
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
2015-05-20 19:35:50 +00:00
Jorim Jaggi
4d1e3862c2
am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
...
* commit '84caa2569722b2ee8234c9a6856a32e148f54463':
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
2015-05-20 19:25:47 +00:00
Jorim Jaggi
84caa25697
am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
...
* commit 'b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232':
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
2015-05-20 19:11:45 +00:00
Jorim Jaggi
b56a10368f
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
2015-05-20 19:01:50 +00:00
Sean Francis-Lyon
d502e97e6c
removing google specific language from aosp strings
...
Change-Id: I2787f8390adcb5dfd6098ee0f1bf50bb51f3f349
2015-05-20 11:29:36 -07:00
Lorenzo Colitti
71d9ac667a
am 39a67fd5: am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
...
* commit '39a67fd5cfc7a585303191db050a82bdb38f38bd':
Address TODOs in WifiNoInternetDialog.
2015-05-20 13:18:00 +00:00
Maurice Lam
f650c72212
am 7a2eae76: am 12bbde91: am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
...
* commit '7a2eae76fc9597541a66bc8dbad084ed021ca405':
[LockScreen] Update initial string in choose lock screens
2015-05-20 13:16:20 +00:00
Lorenzo Colitti
39a67fd5cf
am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
...
* commit '8f4bf8677c022fe7368ba4c9a96ac9e8de778a70':
Address TODOs in WifiNoInternetDialog.
2015-05-20 09:56:41 +00:00
Lorenzo Colitti
8f4bf8677c
am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
...
* commit 'f675409e238bcd3df44fe0026a49e89cd30a5bdf':
Address TODOs in WifiNoInternetDialog.
2015-05-20 09:47:41 +00:00
Lorenzo Colitti
f675409e23
Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
2015-05-20 08:04:43 +00:00
Maurice Lam
7a2eae76fc
am 12bbde91: am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
...
* commit '12bbde919befdf7d0700e951da5bf334cc248ecd':
[LockScreen] Update initial string in choose lock screens
2015-05-20 02:00:01 +00:00
Maurice Lam
12bbde919b
am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
...
* commit 'efbe46612d3253e683ec14cadabf638450b39486':
[LockScreen] Update initial string in choose lock screens
2015-05-20 01:50:50 +00:00
Maurice Lam
efbe46612d
Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
2015-05-20 01:42:42 +00:00
Maurice Lam
163dee9fb7
[LockScreen] Update initial string in choose lock screens
...
In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").
Bug: 20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e
2015-05-19 17:27:12 -07:00
Fyodor Kupolov
e698169afb
am eecff41c: am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
...
* commit 'eecff41cfc812981a8437d2d9b554a18a3a32a05':
Added SearchIndexProvider for UserSettings
2015-05-19 23:02:54 +00:00
Jeff Sharkey
4a99db6887
am 1ccf4441: am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit '1ccf44418ea5c86406136380434be52a3effda3a':
Warn user when adopted device is slow.
2015-05-19 23:02:53 +00:00
Xiyuan Xia
9c073e93c4
am a61ad9e5: am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev
...
* commit 'a61ad9e5e58cf12eecd73717f9dec6bb48e895e7':
No input instead of disabling password/pin entry
2015-05-19 23:02:51 +00:00
Guang Zhu
4d7cac9936
am 7375f0df: am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
...
* commit '7375f0df8940653eb13801b6583a5e4746a42fef':
Monkey should not be allowed to switch USB mode
2015-05-19 23:02:50 +00:00
Nicolas Prevot
6e851981da
am 93a46554: am e60c44a8: am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
...
* commit '93a465546094e6a8f40afdeaf1673682e0eb2297':
Remove the check hasMultipleUsers in Settings.
2015-05-19 23:02:49 +00:00
Jason Monk
b9d7a14973
am 070b24ad: am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev
...
* commit '070b24ade271d704710ada32ee936bbfa4c25bd1':
Default ignore optimizations to show system apps
2015-05-19 23:02:48 +00:00
Fyodor Kupolov
eecff41cfc
am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
...
* commit 'dc774b618bf8f0ce30b50fe2f4bb0972308a34f7':
Added SearchIndexProvider for UserSettings
2015-05-19 22:52:06 +00:00
Jeff Sharkey
1ccf44418e
am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit '719d0ad90479fc84d0dad1a8fa539b7fee4da746':
Warn user when adopted device is slow.
2015-05-19 22:51:15 +00:00
Xiyuan Xia
a61ad9e5e5
am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev
...
* commit '0fa945f099364ff05e42899a1da989b12da0a043':
No input instead of disabling password/pin entry
2015-05-19 22:51:07 +00:00
Guang Zhu
7375f0df89
am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
...
* commit 'b340980deea8a6948d4e8a602557b5721d45a662':
Monkey should not be allowed to switch USB mode
2015-05-19 22:50:48 +00:00
