PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,933 Commits 1 Branch 0 Tags
f13f08be291ff5cfe52b6fc99112e533698af41a
Commit Graph

20933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f13f08be29 am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'fe6fc96a59903f77663ae5435183055be9cc5b74':
  Import translations. DO NOT MERGE
 2015-07-29 14:15:18 +00:00
Geoff Mendal
fe6fc96a59 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-29 13:59:28 +00:00
Geoff Mendal
a497606a49 Import translations. DO NOT MERGE 
Change-Id: Ic5113dd5d45744811ac6ca45f037333b7f659362
Auto-generated-cl: translation import
 2015-07-29 06:56:59 -07:00
Martijn Coenen
d93b641280 am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit '3c975a9fc15c39077613ce741e71fa2baf789492':
  Add contactless symbol to NFC resources.
 2015-07-29 13:55:08 +00:00
Martijn Coenen
3c975a9fc1 am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
  Add contactless symbol to NFC resources.
 2015-07-29 13:34:38 +00:00
Martijn Coenen
edb2668c6d Merge "Add contactless symbol to NFC resources." into mnc-dev 2015-07-29 13:21:40 +00:00
Julia Reynolds
1990f8f722 am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev 
* commit 'cb91edaeb2fd9bdf8a77a994c4767fac808bbe36':
  Use pattern visibility setting on confirm pattern screen.
 2015-07-29 13:00:27 +00:00
Julia Reynolds
f2d5e02c4d am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit '39768c86af48e26717110814f2f208e64e854331':
  Bump string char limit.
 2015-07-29 13:00:24 +00:00
Julia Reynolds
cb91edaeb2 am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev 
* commit '300d6fd90c3b63948d86e140353604baa8339a34':
  Use pattern visibility setting on confirm pattern screen.
 2015-07-29 12:39:12 +00:00
Julia Reynolds
39768c86af am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.
 2015-07-29 12:39:11 +00:00
Julia Reynolds
300d6fd90c Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev 2015-07-29 12:25:54 +00:00
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
b0390ed0e5 am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
  Fix tap & pay strings.
 2015-07-29 10:06:07 +00:00
Martijn Coenen
927369befd Add contactless symbol to NFC resources. 
Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431
 2015-07-29 10:10:35 +02:00
Martijn Coenen
de661d5b15 am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.
 2015-07-29 08:10:14 +00:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Zach Johnson
b5c146eef9 am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev 
* commit 'ecb19d540025a6c1855d148f1b4015f3a107bfd1':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
 2015-07-28 23:18:57 +00:00
Zach Johnson
ecb19d5400 am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev 
* commit 'a425e86478b60c4eb1f90f47197fa244379879de':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
 2015-07-28 22:57:58 +00:00
Zach Johnson
a425e86478 Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev 2015-07-28 22:36:31 +00:00
Julia Reynolds
8bdb556174 am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev 
* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
  Prevent crash in app memory updater.
 2015-07-28 21:16:06 +00:00
Julia Reynolds
2ade0a5e7b am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev 
* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
  Hide usage graph on app usage details pages.
 2015-07-28 21:16:03 +00:00
Julia Reynolds
85bdb77308 am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev 
* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.
 2015-07-28 20:54:07 +00:00
Julia Reynolds
b7c6306b83 am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev 
* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.
 2015-07-28 20:54:06 +00:00
Julia Reynolds
5b5ed310d4 Merge "Prevent crash in app memory updater." into mnc-dev 2015-07-28 20:32:08 +00:00
Julia Reynolds
feeae4cdeb Merge "Hide usage graph on app usage details pages." into mnc-dev 2015-07-28 20:32:05 +00:00
Jorim Jaggi
831e3f665a am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev 
* commit '7abb5164987b812271ac3ba2541e95400834ec70':
  Make fingerprint error text a live region
 2015-07-28 20:30:43 +00:00
Jorim Jaggi
4d0b9669e8 am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 
* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
  Adjust enrollment UI for sw400 devices
 2015-07-28 20:30:41 +00:00
Jorim Jaggi
a15cf22796 am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev 
* commit '22064d8b89dbe4feb79acff3606540f416bd00a0':
  Don't use screenshot if structure is disabled (2/2)
 2015-07-28 20:30:40 +00:00
Jorim Jaggi
7abb516498 am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev 
* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region
 2015-07-28 20:08:01 +00:00
Jorim Jaggi
f6bdf5321f am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 
* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices
 2015-07-28 20:08:00 +00:00
Jorim Jaggi
22064d8b89 am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev 
* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
  Don't use screenshot if structure is disabled (2/2)
 2015-07-28 20:07:58 +00:00
Jorim Jaggi
5458688c1a Merge "Make fingerprint error text a live region" into mnc-dev 2015-07-28 19:51:03 +00:00
Jorim Jaggi
74af384cae Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 2015-07-28 19:50:47 +00:00
Jorim Jaggi
4d9f5c91ae Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev 2015-07-28 19:49:43 +00:00
Julia Reynolds
ed91bbdb1f Prevent crash in app memory updater. 
Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d
 2015-07-28 15:49:39 -04:00
Jorim Jaggi
e32c17580e Don't use screenshot if structure is disabled (2/2) 
Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
 2015-07-28 12:07:10 -07:00
Julia Reynolds
5dadca81eb Bump string char limit. 
Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
 2015-07-28 13:39:24 -04:00
Martijn Coenen
b637ba08ad Fix tap & pay strings. 
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
 2015-07-28 16:37:39 +02:00
Julia Reynolds
36a38c95d5 Use pattern visibility setting on confirm pattern screen. 
Bug: 22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3
 2015-07-28 10:14:07 -04:00
Julia Reynolds
1740ce4f0c Hide usage graph on app usage details pages. 
Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
 2015-07-28 10:03:13 -04:00
Jorim Jaggi
e0120a8e38 am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
  Adjust choose assist app string
 2015-07-28 01:06:24 +00:00
Jorim Jaggi
bcb0011dd9 am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev 
* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
  Fix blank confirm device credential activity
 2015-07-28 01:06:22 +00:00
Jorim Jaggi
ba435f0ce0 Make fingerprint error text a live region 
Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
 2015-07-27 18:00:04 -07:00
Jorim Jaggi
cc5c7809c5 am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string
 2015-07-28 00:50:45 +00:00
Jorim Jaggi
afd5a84830 am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev 
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity
 2015-07-28 00:50:44 +00:00
Jorim Jaggi
730389bd82 Merge "Adjust choose assist app string" into mnc-dev 2015-07-28 00:39:12 +00:00
Jorim Jaggi
dcf61a2dfa Merge "Fix blank confirm device credential activity" into mnc-dev 2015-07-28 00:36:00 +00:00
Jorim Jaggi
9b456e5f9d Adjust enrollment UI for sw400 devices 
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
 2015-07-27 17:31:58 -07:00
Jorim Jaggi
66664bea91 Adjust choose assist app string 
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
 2015-07-27 14:53:48 -07:00
Selim Cinek
d1c8a6127d am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev 
* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
  Autocapitalizing the fingerprint names now
 2015-07-27 21:25:12 +00:00