Lorenzo Colitti
dcc6155426
Reword "no internet access" dialog to conform with mocks.
...
Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
2015-06-10 23:38:09 +09:00
Jason Monk
caec03f9e5
Remove periods from ignore optimizations summaries
...
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2
Merge "Advanced apps updates (2/2)" into mnc-dev
2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8
Merge "Add sd card string, just in case" into mnc-dev
2015-06-10 12:59:30 +00:00
Jeff Brown
b18130c0df
Add simulated 4K display modes.
...
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
2015-06-09 19:52:24 -07:00
Casper Bonde
4bc913b7c5
am fa9fcf11: am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
* commit 'fa9fcf119b6e44b1b1deaa8a080baa9e087ef31c':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
2015-06-09 22:19:53 +00:00
Casper Bonde
e278a208bc
SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com >
2015-06-09 21:42:15 +00:00
Jason Monk
877c1dfd2a
am a59d4b9c: am 0087749f: am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
...
* commit 'a59d4b9cd15e659edb451b22ee8dac5ea285cc83':
Top level: "Storage" -> "Storage & USB"
2015-06-09 21:11:57 +00:00
Jason Monk
51f7c067aa
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
2015-06-09 20:30:35 +00:00
Jason Monk
1169e1295d
am 40aba9d8: am 8987128d: am 4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
...
* commit '40aba9d87cf6878fe5468136493d2633002a00d2':
Accounts -> Account sync
2015-06-09 20:27:57 +00:00
Jason Monk
4da8e84432
Add sd card string, just in case
...
Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
2015-06-09 16:26:07 -04:00
Jason Monk
46a134f98d
am 60142e62: am 4afe7429: am 86333477: Add strings that will be used for new ignore opt ux
...
* commit '60142e6230b5554b8d812d55f7dbed43f63dc904':
Add strings that will be used for new ignore opt ux
2015-06-09 20:02:07 +00:00
Jason Monk
ba0e2c8688
Advanced apps updates (2/2)
...
Change the title of the screen, add a category to break things up
Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
2015-06-09 16:01:28 -04:00
Jason Monk
4ab327b05f
Merge "Accounts -> Account sync" into mnc-dev
2015-06-09 19:50:12 +00:00
Jason Monk
2b6c3c0f72
Top level: "Storage" -> "Storage & USB"
...
Bug: 21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
2015-06-09 15:32:14 -04:00
Jason Monk
86333477b7
Add strings that will be used for new ignore opt ux
...
Bug: 21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
2015-06-09 15:24:05 -04:00
Jason Monk
43db745ea0
Accounts -> Account sync
...
Bug: 21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
2015-06-09 14:46:57 -04:00
Sudheer Shanka
48ea838b42
am 33696a7e: am ec547789: am b259b384: Merge "Update some strings." into mnc-dev
...
* commit '33696a7e837fed3c3dccb71aed82d4366a814ea2':
Update some strings.
2015-06-09 17:12:34 +00:00
Sudheer Shanka
566678a013
Update some strings.
...
Bug: 20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
2015-06-09 14:29:26 +01:00
Makoto Onuki
375c3a080e
Show list of permissions instead of just numbers
...
Bug 21615746
Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
2015-06-08 17:48:46 -07:00
John Spurlock
6b600d972d
am 541e5c41: am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
...
* commit '541e5c410cbb87d168faed5da411447390acd63d':
Settings: Update notification listener user prompt strings.
2015-06-08 21:39:36 +00:00
John Spurlock
90e27a4893
Settings: Update notification listener user prompt strings.
...
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
2015-06-08 16:50:36 -04:00
John Spurlock
05285a4498
am 22684501: am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
...
* commit '22684501474d6a3c145b42131c4ad5889fdf6fa4':
Settings: Update DND access dialog to new user flow.
2015-06-08 17:15:09 +00:00
Martijn Coenen
0d12ebdc90
am a048b2c7: am 4504eb36: am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev
...
* commit 'a048b2c76a2af99a6504ddd24cdedd98d1348f78':
Add NFC payment "how it works" screens.
2015-06-08 17:15:07 +00:00
John Spurlock
178d46a9b5
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
2015-06-08 16:39:33 +00:00
John Spurlock
a00194d998
Settings: Update DND access dialog to new user flow.
...
- Only list apps in the DND access list that have included
the corresponding permission in their manifest.
- Show a scary user warning before enabling access per app.
- Update manifest to follow framework intent action rename.
Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
2015-06-08 12:27:03 -04:00
Martijn Coenen
1276b21317
Merge "Add NFC payment "how it works" screens." into mnc-dev
2015-06-08 08:02:30 +00:00
Sanket Padawe
dca52b023d
am 7e7376bf: am ca324f5a: am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev
...
* commit '7e7376bf757c54e892bf963810101a0237b4dc4f':
Fix wifi network strings shown in Settings.
2015-06-06 17:05:17 +00:00
Sanket Padawe
547089c376
Merge "Fix wifi network strings shown in Settings." into mnc-dev
2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0
Fix wifi network strings shown in Settings.
...
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
2015-06-05 18:49:12 -07:00
Ruben Brunk
823ea696c7
am 2585210c: am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
...
* commit '2585210c8da69c8882f8f86fd3273d5f623248fd':
Add UI for camera + flashlight battery reporting.
2015-06-06 00:41:12 +00:00
Ruben Brunk
e35df2ff3b
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac
Add UI for camera + flashlight battery reporting.
...
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
2015-06-05 16:05:18 -07:00
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
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
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
1b93ef1d9b
Merge "Settings > Apps list style updates" into mnc-dev
2015-06-05 13:36:27 +00:00
Jason Monk
d7dbe16142
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
2015-06-05 13:23:13 +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
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
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
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
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
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 .
Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
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
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
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