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
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
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
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
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
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
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
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
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
Jeff Sharkey
719d0ad904
am d0393cd0
: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
Warn user when adopted device is slow.
2015-05-19 19:10:53 +00:00
Jeff Sharkey
d0393cd041
Merge "Warn user when adopted device is slow." into mnc-dev
2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380
Warn user when adopted device is slow.
...
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.
Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
2015-05-19 12:00:56 -07:00
Robin Lee
4dda36a220
am 7526238a
: am 196d0543
: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
Badge managed WiFi networks
2015-05-19 13:42:54 +00:00
Robin Lee
7526238a74
am 196d0543
: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '196d0543737cef8fcf5e193af688a093a3743597':
Badge managed WiFi networks
2015-05-19 13:31:37 +00:00
Robin Lee
196d054373
Merge "Badge managed WiFi networks" into mnc-dev
2015-05-19 13:22:10 +00:00
Jorim Jaggi
65e43332cc
am a351cda3
: am a2138a34
: Merge "Add setting to disable assist data (2/2)." into mnc-dev
...
* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
Add setting to disable assist data (2/2).
Try not to crash while AppInfo is finishing
Banish the memory page to Apps > Advanced
Fix crash when removing fingerprint
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-19 05:02:24 +00:00
Jorim Jaggi
a351cda36e
am a2138a34
: Merge "Add setting to disable assist data (2/2)." into mnc-dev
...
* commit 'a2138a34852be7bcb793940269592ec5669cc3b4':
Add setting to disable assist data (2/2).
Try not to crash while AppInfo is finishing
Banish the memory page to Apps > Advanced
Fix crash when removing fingerprint
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-19 04:51:08 +00:00
Jorim Jaggi
a2138a3485
Merge "Add setting to disable assist data (2/2)." into mnc-dev
2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab
Add setting to disable assist data (2/2).
...
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
2015-05-18 21:38:45 -07:00
Matthew Williams
aa64ba5550
am 9d2edaf2
: am 6ee5a4d0
: Update Backup/reset UI
...
* commit '9d2edaf2bcd9e2a52e9092e40619d171847e84ee':
Update Backup/reset UI
2015-05-19 01:41:38 +00:00
Matthew Williams
9d2edaf2bc
am 6ee5a4d0
: Update Backup/reset UI
...
* commit '6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI
2015-05-19 01:31:47 +00:00
Matthew Williams
6ee5a4d0ef
Update Backup/reset UI
...
BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
2015-05-18 18:16:09 -07:00
xinhe
01451c89e1
am 43e25738
: am 512bb7e2
: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '43e257381cb0be46708c5c19922e5d03e9bbb131':
Rename config AP Band for Select AP Band
2015-05-18 21:46:54 +00:00
xinhe
43e257381c
am 512bb7e2
: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
2015-05-18 21:33:49 +00:00
xinhe
baf4dab3a8
Rename config AP Band for Select AP Band
...
Bug:19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
2015-05-18 14:19:58 -07:00
Robin Lee
9aaee290ad
Badge managed WiFi networks
...
Bug: 19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2
2015-05-18 18:42:36 +01:00
Svet Ganov
9027bc2f2d
am 9a3ad8a3
: am 67e067ff
: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '9a3ad8a36bd7eb7453f532746aa92189404df01a':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:40:15 +00:00
Svet Ganov
9a3ad8a36b
am 67e067ff
: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:23:50 +00:00
Svet Ganov
67e067fff4
Hide platform platform legacy permissions behind a menu option - settings.
...
bug:21195624
Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c
2015-05-16 22:59:41 -07:00
Jason Monk
70842a4e3b
am 1f7861b6
: am 0c0e35ef
: Banish the memory page to Apps > Advanced
...
* commit '1f7861b608e49c3336ffe14a074063559e0e0aa7':
Banish the memory page to Apps > Advanced
2015-05-15 16:37:56 +00:00
Jason Monk
1f7861b608
am 0c0e35ef
: Banish the memory page to Apps > Advanced
...
* commit '0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
Banish the memory page to Apps > Advanced
2015-05-15 16:26:33 +00:00
Jason Monk
0c0e35ef30
Banish the memory page to Apps > Advanced
...
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 11:37:42 -04:00