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
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
Jason Monk
0732a64602
Merge "Fix some dark theme issues" into mnc-dev
2015-06-03 17:30:54 +00:00
Jason Monk
cb8ccbb3b5
Fix some dark theme issues
...
Bug: 21117509
Bug: 21077345
Bug: 21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
2015-06-03 13:29:16 -04:00
Barnaby James
ef0b43625c
Merge "Fix TTS for Zen mode voice activity." into mnc-dev
2015-06-03 17:09:56 +00:00
Jason Monk
36457e06d0
am 8b8092aa: am 3974d3d4: am ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev
...
* commit '8b8092aa0995e403cba09b19f955aa2bef00974a':
Make Theme a DropDownPreference
2015-06-01 20:33:09 +00:00
Jason Monk
44cf2f9f39
am 75059f1a: am b77a8177: am 0d2eea38: Merge "Change name of search menu item to be more descriptive" into mnc-dev
...
* commit '75059f1ac43c536eba3a281270a432ec235778cc':
Change name of search menu item to be more descriptive
2015-06-01 20:20:20 +00:00
Jason Monk
ef1d4b66ab
Merge "Make Theme a DropDownPreference" into mnc-dev
2015-06-01 19:54:53 +00:00
Jason Monk
3d95908e02
Make Theme a DropDownPreference
...
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug: 21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
2015-06-01 15:49:17 -04:00
Jason Monk
0d2eea38bf
Merge "Change name of search menu item to be more descriptive" into mnc-dev
2015-06-01 19:45:27 +00:00
Jason Monk
e5d14dc606
Change name of search menu item to be more descriptive
...
(for accessibility)
Bug: 20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
2015-06-01 15:21:07 -04:00
Maurice Lam
76c88ac405
am 96141ef9: am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
...
* commit '96141ef9e9151974fde98d942f1b4e62c1f5ffbd':
[WifiSetup] Add + icon to Add another network
2015-06-01 19:13:38 +00:00
Maurice Lam
6cd24c687d
Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
2015-06-01 18:40:47 +00:00
Stuart Scott
47ed6ca004
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a )
2015-06-01 16:30:48 +00:00
Fyodor Kupolov
963da2b1e4
am aeaf219e: am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev
...
* commit 'aeaf219eaebb6c0c541a0f701553ee0225d89794':
Use DimmableIconPreference for Add user action
2015-06-01 15:48:20 +00:00
Maurice Lam
8dc986216c
[WifiSetup] Add + icon to Add another network
...
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.
Bug: 21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
2015-05-29 20:34:03 -07:00
Fyodor Kupolov
01f35ce46e
Merge "Use DimmableIconPreference for Add user action" into mnc-dev
2015-05-29 20:42:55 +00:00
Jason Monk
6e76f98f06
am eb859db1: am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev
...
* commit 'eb859db14fbb0b7050d518edade44409ef213743':
More memory updates
2015-05-28 15:05:02 +00:00
Jason Monk
ab2046aa76
More memory updates
...
- Some string changes
- Make processes in memory details not clickable
- Put processes in a 'detail' category
- Hide processes when an app only has 1
- Add memory item to bottom of app info page
Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
2015-05-28 10:20:56 -04:00
Maurice Lam
a80694d476
am 2991c526: am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
...
* commit '2991c52600a15205e6ca0aac76e6e5b00149c23a':
[LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 21:01:15 +00:00
Maurice Lam
6fd26aae0d
Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
2015-05-27 18:35:09 +00:00