PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,945 Commits 1 Branch 0 Tags
f2ae4cb731a2bc45db3060fa84d372dbc3358909
Commit Graph

21945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
6785be7362 am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev 
* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
  Change 'data' label to 'data usage'.
 2015-07-29 18:03:56 +00:00
Julia Reynolds
c2f62f650a am 00b5488c: Merge "Change assist app warning message text" into mnc-dev 
* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
  Change assist app warning message text
 2015-07-29 17:41:15 +00:00
Julia Reynolds
089e9e9a0d am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev 
* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
  Change 'data' label to 'data usage'.
 2015-07-29 17:41:14 +00:00
Julia Reynolds
00b5488c67 Merge "Change assist app warning message text" into mnc-dev 2015-07-29 17:26:12 +00:00
Julia Reynolds
ae422fd099 Merge "Change 'data' label to 'data usage'." into mnc-dev 2015-07-29 17:25:41 +00:00
Julia Reynolds
ff0e1650d9 Change 'data' label to 'data usage'. 
Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
 2015-07-29 13:15:14 -04:00
Sanket Padawe
158fa95218 am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 17:08:45 +00:00
Julia Reynolds
5bdf80c868 Change assist app warning message text 
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
 2015-07-29 13:02:09 -04:00
Chris Wren
97ad12db5c am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev 
* commit '59f07cc7c80b144c3ee618955fa6d8121347a6a7':
  fix InactiveApps instrumentation
 2015-07-29 16:49:46 +00:00
Sanket Padawe
df9b13af9b am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 16:44:58 +00:00
Chris Wren
59f07cc7c8 am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev 
* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
  fix InactiveApps instrumentation
 2015-07-29 16:26:32 +00:00
Sanket Padawe
74d8594950 am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 16:15:17 +00:00
Chris Wren
cb176a41ad am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev 
* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
  fix InactiveApps instrumentation
 2015-07-29 16:11:21 +00:00
Chris Wren
2a56d7f23b Merge "fix InactiveApps instrumentation" into mnc-dev 2015-07-29 14:57:14 +00:00
Geoff Mendal
6e639eec12 am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'f13f08be291ff5cfe52b6fc99112e533698af41a':
  Import translations. DO NOT MERGE
 2015-07-29 14:36:40 +00:00
Martijn Coenen
034b6801f4 am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit 'd93b6412801706311b9389f789ecdf76969695db':
  Add contactless symbol to NFC resources.
 2015-07-29 14:16:35 +00:00
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
3d6a40af6e am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev 
* commit '1990f8f722a050e8eccbf9755c5a6d7e1487132f':
  Use pattern visibility setting on confirm pattern screen.
 2015-07-29 13:20:37 +00:00
Julia Reynolds
826400bdbb am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit 'f2d5e02c4d9334545247e437712f4407e97f84ca':
  Bump string char limit.
 2015-07-29 13:20:33 +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
120ed35243 am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit 'b0390ed0e57af73a2ee6a692598fe8dd28748d72':
  Fix tap & pay strings.
 2015-07-29 10:27:36 +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
Jorim Jaggi
aa587b39b6 Adjustments for find sensor screen 
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
 2015-07-28 23:58:56 +00:00
Zach Johnson
0f5373e0eb am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev 
* commit 'b5c146eef9dcbc405530ef1855d192ec59119100':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
 2015-07-28 23:33:58 +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
981ff1825e am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev 
* commit '8bdb556174bfb8a903040a5310e3d48f2c4be5bf':
  Prevent crash in app memory updater.
 2015-07-28 21:37:27 +00:00
Julia Reynolds
13a070549d am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev 
* commit '2ade0a5e7bb52438732555f860f924c0eeacd3c2':
  Hide usage graph on app usage details pages.
 2015-07-28 21:37:26 +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
Jorim Jaggi
a67487eed2 am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev 
* commit '831e3f665a1f2ea1fa95f6c3a3380713ce9c00b1':
  Make fingerprint error text a live region
 2015-07-28 20:54:38 +00:00
Jorim Jaggi
f97f741693 am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 
* commit '4d0b9669e8d5813fa61f7515ae3cfc7aca13851b':
  Adjust enrollment UI for sw400 devices
 2015-07-28 20:54:36 +00:00
Jorim Jaggi
72f141a518 am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev 
* commit 'a15cf2279619a35d1cfe868fb116d90ed0c4a0c8':
  Don't use screenshot if structure is disabled (2/2)
 2015-07-28 20:54:35 +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