Martijn Coenen
cbcc76e8d3
Add NFC payment "how it works" screens.
...
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
2015-06-05 21:35:55 +02:00
Maurice Lam
32d1728aa3
am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit 'e8f39de661a4a22ced8c72677f53f5420792736e':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:34:20 +00:00
Maurice Lam
e8f39de661
am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit '26a42d1099fece0bc388db2b923ad5c5411bd4f3':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:22:46 +00:00
Maurice Lam
26a42d1099
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
2015-06-05 19:13:18 +00:00
Jason Monk
2055685bfd
am 9344bf62: am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '9344bf62321c4c344677b10684935c44be159e7c':
Settings > Apps list style updates
2015-06-05 14:08:44 +00:00
Jason Monk
9344bf6232
am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '92f53c0223a84526b51d22d0799e55bc486d63c1':
Settings > Apps list style updates
2015-06-05 13:55:14 +00:00
Jason Monk
2ccfdac69f
am 28efc11e: am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit '28efc11e2bfd94f4b5ba962201f99bbf946b7d27':
Fix some dark theme issues (Take 2)
2015-06-05 13:54:33 +00:00
Jason Monk
92f53c0223
am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
Settings > Apps list style updates
2015-06-05 13:48:13 +00:00
Jason Monk
28efc11e2b
am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit 'f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
Fix some dark theme issues (Take 2)
2015-06-05 13:43:35 +00:00
Jason Monk
1b93ef1d9b
Merge "Settings > Apps list style updates" into mnc-dev
2015-06-05 13:36:27 +00:00
Jason Monk
f5a7d673fa
am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit 'd7dbe16142b0fc3faf448a81f3be13af7e95909f':
Fix some dark theme issues (Take 2)
2015-06-05 13:31:00 +00:00
Jason Monk
d7dbe16142
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
2015-06-05 13:23:13 +00:00
Maurice Lam
25e3081575
Update Setup Wizard redaction interstitial styles
...
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
2015-06-04 17:17:07 -07:00
Jason Monk
bf593b6d36
am 050785af: am 98aedcd6: am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '050785aff5300af9c83a9a06a66b76c79856a50d':
Fix apps/memory screen's spinner alignment
2015-06-04 19:27:11 +00:00
Jason Monk
e103cb157b
Settings > Apps list style updates
...
Bug: 21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
2015-06-04 15:17:16 -04:00
Jason Monk
050785aff5
am 98aedcd6: am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '98aedcd64f7c180488c33ba6c2f96d22b0a92e96':
Fix apps/memory screen's spinner alignment
2015-06-04 19:13:24 +00:00
Jason Monk
98aedcd64f
am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '0ad408e646fe6d8f75286a2838bf640d79fcf2ea':
Fix apps/memory screen's spinner alignment
2015-06-04 18:43:28 +00:00
Jason Monk
2d499533b7
Fix some dark theme issues (Take 2)
...
Now with visible lock patterns! Both light and dark!
Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
2015-06-04 14:16:10 -04:00
Jason Monk
0ad408e646
Merge "Fix apps/memory screen's spinner alignment" into mnc-dev
2015-06-04 18:09:09 +00:00
Jason Monk
9ed8a0bc64
Fix apps/memory screen's spinner alignment
...
Bug: 21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b
2015-06-04 13:54:06 -04:00
Jason Monk
9e57ec3ea3
am 888605de: am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit '888605debd9d5ae35fed839893711aa2c3a3cc70':
Fix dashboard shadows on tablets
2015-06-04 16:53:49 +00:00
Jason Monk
888605debd
am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit 'f680c6919184cbe6750d64b3d0e7a4487514f9db':
Fix dashboard shadows on tablets
2015-06-04 16:43:08 +00:00
Jason Monk
f680c69191
am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit '34784ec862d86e2f3b3b115e7c065b052b7bc888':
Fix dashboard shadows on tablets
2015-06-04 16:21:43 +00:00
John Spurlock
11d500c9d1
am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
Settings: Add zen rule name warning text.
2015-06-04 16:16:16 +00:00
Jason Monk
34784ec862
Merge "Fix dashboard shadows on tablets" into mnc-dev
2015-06-04 16:14:32 +00:00
Jason Monk
00dccfcbe8
Fix dashboard shadows on tablets
...
Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
2015-06-04 12:04:30 -04:00
John Spurlock
dec8f8107c
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
Settings: Add zen rule name warning text.
2015-06-04 16:04:13 +00:00
John Spurlock
afa64f45ab
am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
Settings: Add zen rule name warning text.
2015-06-04 15:51:05 +00:00
John Spurlock
1a1181edde
Merge "Settings: Add zen rule name warning text." into mnc-dev
2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8
Settings: Add zen rule name warning text.
...
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
2015-06-04 11:37:36 -04:00
Jason Monk
3307c649c5
am fb8de829: am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit 'fb8de829b51bf5168590a3a2a468578b5970106f':
Disable owner info when no lock screen
2015-06-04 13:45:31 +00:00
Jason Monk
fb8de829b5
am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit '1b53d0c25be74260dc654b481876a5e2d9ad18a8':
Disable owner info when no lock screen
2015-06-04 13:32:56 +00:00
Jason Monk
1b53d0c25b
am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit '41012d5e7b37fe5c2373f3215612d26331f40ba0':
Disable owner info when no lock screen
2015-06-04 13:20:27 +00:00
Jason Monk
41012d5e7b
Merge "Disable owner info when no lock screen" into mnc-dev
2015-06-04 13:08:48 +00:00
Jim Miller
e7f78bd17b
am 1955fc5f: am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
...
* commit '1955fc5fb52d154017c52c069440824ec3d8d27e':
Revert "Fix some dark theme issues"
2015-06-04 03:22:08 +00:00
Jim Miller
1955fc5fb5
am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
...
* commit 'dddca46b581e0c40868242cb3952da8b409cc9c6':
Revert "Fix some dark theme issues"
2015-06-04 03:11:42 +00:00
Jim Miller
dddca46b58
am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
...
* commit '471da56938c2ca8102f7740b3eb5704f48d86aff':
Revert "Fix some dark theme issues"
2015-06-04 02:59:20 +00:00
Jim Miller
471da56938
Merge "Revert "Fix some dark theme issues"" into mnc-dev
2015-06-04 02:52:12 +00:00
Jim Miller
6433bd8f6a
Revert "Fix some dark theme issues"
...
This breaks the pattern entry screens of SecuritySettings. Reverting until we can take a closer look.
This reverts commit cb8ccbb3b5
2015-06-04 02:45:40 +00:00
Stuart Scott
9a8933ab5f
am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
...
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
Re-add a string which was accidently removed.
2015-06-04 01:28:13 +00:00
Stuart Scott
9eb4d10345
am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
...
* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
Re-add a string which was accidently removed.
2015-06-04 01:14:18 +00:00
Stuart Scott
01a6351f7a
am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
...
* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
Re-add a string which was accidently removed.
2015-06-04 01:03:15 +00:00
Stuart Scott
fcf64237b7
Merge "Re-add a string which was accidently removed." into mnc-dev
2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41
Re-add a string which was accidently removed.
...
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
2015-06-03 17:01:42 -07:00
Jason Monk
0847796339
Disable owner info when no lock screen
...
Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
2015-06-03 16:37:07 -04:00
Jason Monk
53f7cddd94
am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev
...
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
Fix some dark theme issues
2015-06-03 19:23:47 +00:00
Jason Monk
ea0aa049ad
am 174ed18d: am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev
...
* commit '174ed18d90a827814c931e08772bbf408ec4033f':
Reorder device category
2015-06-03 19:23:44 +00:00
Barnaby James
3571671d99
am 6a441e2a: am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
...
* commit '6a441e2aba09d350df4834e21d72c43afaea8634':
Fix TTS for Zen mode voice activity.
2015-06-03 19:23:43 +00:00
Xiyuan Xia
8b89e373fd
am b2508e10: am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
...
* commit 'b2508e10d1d8676d78a466b0c337a71a3d03dbb8':
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
2015-06-03 19:23:42 +00:00
Jason Monk
48424d9def
am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev
...
* commit '84cd3bfb43174215abb8648e14e0481380b27828':
Fix some dark theme issues
2015-06-03 18:48:01 +00:00
