PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,170 Commits 1 Branch 0 Tags
f3cc23524fddcc2d55d17747a901b2090773e429
Commit Graph

7484 Commits

Author SHA1 Message Date
John Spurlock
541e5c410c am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '1b76e7904744a4cde25af73ff9b378d3a765c640':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:28:59 +00:00
John Spurlock
1b76e79047 am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '9a5836107664b796c3ae37c25c89cbf070243edb':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:12:23 +00:00
John Spurlock
9a58361076 Merge "Settings: Update notification listener user prompt strings." into mnc-dev 2015-06-08 21:04:19 +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
Jorim Jaggi
412a5d15e5 am 89246fd5: am 7e38eea8: Merge "Fix settings overdraw" into mnc-dev 
* commit '89246fd560d1c1f2209c00c1618e5ec6ac432ce1':
  Fix settings overdraw
 2015-06-08 19:02:37 +00:00
Jorim Jaggi
89246fd560 am 7e38eea8: Merge "Fix settings overdraw" into mnc-dev 
* commit '7e38eea8170249ca13c54748d6ba4c615528cad6':
  Fix settings overdraw
 2015-06-08 18:49:06 +00:00
Jorim Jaggi
7e38eea817 Merge "Fix settings overdraw" into mnc-dev 2015-06-08 18:39:25 +00:00
John Spurlock
2268450147 am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '7db1063958b8192237dec6ffa2de2092ccd0f486':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 17:04:17 +00:00
Martijn Coenen
a048b2c76a am 4504eb36: am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit '4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
  Add NFC payment "how it works" screens.
 2015-06-08 17:04:15 +00:00
John Spurlock
7db1063958 am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '178d46a9b5cccfa5106028375877b2eb0bf005f7':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 16:52:01 +00:00
Martijn Coenen
4504eb36be am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit '1276b21317d0f86bbd3f59b14d9c0c745cecfa56':
  Add NFC payment "how it works" screens.
 2015-06-08 16:42:41 +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
Geoff Mendal
0053802f23 Import translations. DO NOT MERGE 
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
 2015-06-08 07:59:45 -07: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
7e7376bf75 am ca324f5a: am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit 'ca324f5abf12bab607c74c5aaa0c5e256c5dcefc':
  Fix wifi network strings shown in Settings.
 2015-06-06 02:21:16 +00:00
Sanket Padawe
ca324f5abf am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit '547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
  Fix wifi network strings shown in Settings.
 2015-06-06 02:09:10 +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
Jorim Jaggi
1fdd4f521c Fix settings overdraw 
Bug: 17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
 2015-06-05 17:42:32 -07:00
Ruben Brunk
2585210c8d am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'bf4938166fc539d348dfb8167b03637fecf4d6c0':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:29:46 +00:00
Ruben Brunk
bf4938166f am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:16:22 +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
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
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
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
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
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
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
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