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

20953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
1b730cb77e am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev 
* commit '434d55e591bfb7cc84fed8d8574624425348a711':
  Adjustments for find sensor screen
 2015-07-29 22:26:16 +00:00
Jorim Jaggi
434d55e591 am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev 
* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
  Adjustments for find sensor screen
 2015-07-29 22:14:09 +00:00
Jorim Jaggi
23ace01340 Merge "Adjustments for find sensor screen" into mnc-dev 2015-07-29 21:58:43 +00:00
Maurice Lam
0ce45dbbe7 am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev 
* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
  [ZenMode] Align text to viewStart in remove dialog
 2015-07-29 18:53:41 +00:00
Maurice Lam
1df9a7cc16 am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev 
* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
  [ZenMode] Align text to viewStart in remove dialog
 2015-07-29 18:39:00 +00:00
Maurice Lam
3760e5e7e4 Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev 2015-07-29 18:25:48 +00:00
Julia Reynolds
24a1ac3620 am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev 
* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
  Change assist app warning message text
 2015-07-29 18:03:57 +00:00
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
Julia Reynolds
5bdf80c868 Change assist app warning message text 
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
 2015-07-29 13:02:09 -04: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
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
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
Jorim Jaggi
aa587b39b6 Adjustments for find sensor screen 
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
 2015-07-28 23:58:56 +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