Geoff Mendal
23d49e0c75
Import translations. DO NOT MERGE
...
Change-Id: I62198fa72a594fd159fcd25478468779ec62b3e0
Auto-generated-cl: translation import
2015-05-25 08:20:07 -07:00
Barnaby James
c54782071a
Fix TTS for Zen mode voice activity.
...
Don't finish activity until TTS has finished.
Incorrect TTS for mix of hours / mins - e.g. 1 hour 45 minutes.
Improve the description of TTS strings for translators.
BUG: 20248251
BUG: 21413212
BUG: 21411622
Change-Id: Id2693ea82b76492216147012216ba07ce75a9d12
2015-05-24 12:30:21 -07:00
Maurice Lam
90d35bfaf9
am 73f865bf: am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
...
* commit '73f865bf8dc8eef9dd6daa15289fb3d389b8cf90':
[WifiSetup] Align to mac address to locale start
2015-05-22 21:42:37 +00:00
Maurice Lam
2f019c6194
am 0640ad68: am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
...
* commit '0640ad681434e2e2efb183f6b59d08516fe9bdf8':
[WifiSetup] Update phone illustrations
2015-05-22 21:42:35 +00:00
Jason Monk
cc6e9ae9c7
am 2821a373: am cf55da1e: am b2f11d01: String changes for app links in settings
...
* commit '2821a373edf50b054e8a68565dbec5a3774dbb56':
String changes for app links in settings
2015-05-22 21:41:59 +00:00
Maurice Lam
73f865bf8d
am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
...
* commit 'b2c02e2709456ebdb10b55d9f97f5db1892e239e':
[WifiSetup] Align to mac address to locale start
2015-05-22 19:48:05 +00:00
Maurice Lam
0640ad6814
am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
...
* commit 'db0e8b65e0a1e15521b93744512933197b32fba7':
[WifiSetup] Update phone illustrations
2015-05-22 19:48:04 +00:00
Maurice Lam
b2c02e2709
am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
...
* commit 'df8d8907a867e4d93f42d0a305371124b4fd599d':
[WifiSetup] Align to mac address to locale start
2015-05-22 19:35:30 +00:00
Maurice Lam
db0e8b65e0
am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
...
* commit '6fdd06dcfc82a246911b1b285b4b6e4f41d0b8fc':
[WifiSetup] Update phone illustrations
2015-05-22 19:35:29 +00:00
Maurice Lam
df8d8907a8
Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
2015-05-22 19:33:19 +00:00
Maurice Lam
6fdd06dcfc
Merge "[WifiSetup] Update phone illustrations" into mnc-dev
2015-05-22 19:27:10 +00:00
Jason Monk
2821a373ed
am cf55da1e: am b2f11d01: String changes for app links in settings
...
* commit 'cf55da1ef517e63a6903e0730683d938cfbcf05c':
String changes for app links in settings
2015-05-22 19:11:52 +00:00
Maurice Lam
cd3fbba9b7
[WifiSetup] Align to mac address to locale start
...
Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.
Bug: 21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930
2015-05-22 11:59:43 -07:00
Jason Monk
cf55da1ef5
am b2f11d01: String changes for app links in settings
...
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
String changes for app links in settings
2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c
String changes for app links in settings
...
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 14:42:45 -04:00
Maurice Lam
65079b2d3c
[WifiSetup] Update phone illustrations
...
Update illustrations in phone layout, to move the buildings up so
that they are not shown when the header is sticky.
Bug: 20954868
Change-Id: I3db4ac19901b5e5fdaeef3bdabe94e81e40b159c
2015-05-22 11:30:51 -07:00
Stuart Scott
176f512c5a
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
2015-05-22 10:19:53 -07:00
Dave Langemak
0f5a085391
am 0d98b2b7: am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
...
* commit '0d98b2b7960be1a24937f80ff66ed5cad644e2f6':
Banish Theme setting to developer options
2015-05-22 00:24:09 +00:00
Dave Langemak
0d98b2b796
am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
...
* commit '1c1e85dc5f628c03f484fb51bf13253e7d10feb6':
Banish Theme setting to developer options
2015-05-22 00:17:46 +00:00
Dave Langemak
1c1e85dc5f
am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
...
* commit 'ea9b3198b43ac7c67c9a4ff3e27bb133fd0c6293':
Banish Theme setting to developer options
2015-05-22 00:06:18 +00:00
Dave Langemak
ea9b3198b4
Merge "Banish Theme setting to developer options" into mnc-dev
2015-05-21 23:56:25 +00:00
Maurice Lam
ee127ed133
am 21deee07: am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
...
* commit '21deee07ee972066aeb0daf6f636618df23364e8':
[LockScreenSetup] Move retry button to top
2015-05-21 22:33:32 +00:00
Maurice Lam
21deee07ee
am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
...
* commit '03d12996462136ab8df91a76f4b8bf77cd53baef':
[LockScreenSetup] Move retry button to top
2015-05-21 22:22:07 +00:00
Jorim Jaggi
ee96ed2613
am 6cbad01c: am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
...
* commit '6cbad01c0b0cd145cc531b813e4541885148b457':
Fix string for fingerprint settings
2015-05-21 22:07:17 +00:00
Maurice Lam
03d1299646
am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
...
* commit '51eec32afa0d4599b437b1823a2b42d44d9bf001':
[LockScreenSetup] Move retry button to top
2015-05-21 22:06:29 +00:00
Maurice Lam
51eec32afa
Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
2015-05-21 21:55:48 +00:00
Jorim Jaggi
6cbad01c0b
am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
...
* commit 'c8f78ec956ba6e59214926b3e442667575a6fc47':
Fix string for fingerprint settings
2015-05-21 21:40:20 +00:00
Jorim Jaggi
c8f78ec956
am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
...
* commit '19ea8b703455cf326e7c481e33e757ff0ddfed62':
Fix string for fingerprint settings
2015-05-21 21:32:37 +00:00
Jorim Jaggi
19ea8b7034
Merge "Fix string for fingerprint settings" into mnc-dev
2015-05-21 21:23:57 +00:00
Jason Monk
df283601c5
Banish Theme setting to developer options
...
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
2015-05-21 16:46:24 -04: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
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
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
Maurice Lam
a9a04efe89
[LockScreenSetup] Move retry button to top
...
Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.
Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
2015-05-21 03:04:11 +00:00
Sean Francis-Lyon
d2e31fd9eb
Merge "removing google specific language from aosp strings"
2015-05-20 23:22:48 +00: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
Fyodor Kupolov
a7a7bfe59f
Use DimmableIconPreference for Add user action
...
Moved DimmableIconPreference from location to the root package since it is
now used in several places.
Add user action now uses DimmableIconPreference. Added a new summary string,
which is displayed when no more users can be added.
Bug: 20892920
Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
2015-05-19 16:44:13 -07: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
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
Jorim Jaggi
3099997b46
Fix string for fingerprint settings
...
Also adjust fingerprint enrollment animation to spec.
Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e
2015-05-19 14:10:05 -07:00
Jorim Jaggi
712530794b
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
...
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
2015-05-19 14:02:05 -07:00