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

21663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3605c4356a am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev 
* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
  fix InactiveApps instrumentation
 2015-07-29 15:18:26 +00:00
Chris Wren
2a56d7f23b Merge "fix InactiveApps instrumentation" into mnc-dev 2015-07-29 14:57:14 +00:00
Martijn Coenen
3e7d3faf20 am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
  Add contactless symbol to NFC resources.
 2015-07-29 14:17:43 +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
0a52b7b3c4 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:38:25 +00:00
Julia Reynolds
72bb3a6924 am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.
 2015-07-29 12:38:24 +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
274d92467a am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.
 2015-07-29 08:12: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
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
4fd8d1e147 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:57 +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
1ae73fafe7 am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev 
* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.
 2015-07-28 20:52:50 +00:00
Julia Reynolds
b506392025 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:52:48 +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
9fd7d6fd63 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:46 +00:00
Jorim Jaggi
4088cef80f 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:44 +00:00
Jorim Jaggi
a77130f7e4 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:08:43 +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
Maurice Lam
b01383beab [ZenMode] Align text to viewStart in remove dialog 
Bug: 22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40
 2015-07-28 10:38:52 -07:00
Chris Wren
f464a9a4a4 fix InactiveApps instrumentation 
Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c
 2015-07-28 16:56:22 +00: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
ba435f0ce0 Make fingerprint error text a live region 
Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
 2015-07-27 18:00:04 -07:00
Jorim Jaggi
69941efa8b am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string
 2015-07-28 00:49:25 +00:00
Jorim Jaggi
e4e8bb3486 am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev 
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity
 2015-07-28 00:49:23 +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
d2b6e1acd0 am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev 
* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
  Autocapitalizing the fingerprint names now
 2015-07-27 21:12:05 +00:00
Selim Cinek
412eb5dfde am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev 
* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
  Added content description for the fingerprint icon
 2015-07-27 21:12:04 +00:00
Selim Cinek
e0f552c140 am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 
* commit '95ddf903495f97f6d008f8723887228015ed7ead':
  Adapted a string in the fingerprint enrollment flow
 2015-07-27 21:12:03 +00:00
Selim Cinek
596ce9bab7 Merge "Autocapitalizing the fingerprint names now" into mnc-dev 2015-07-27 20:58:01 +00:00
Selim Cinek
a8c7c8c891 Merge "Added content description for the fingerprint icon" into mnc-dev 2015-07-27 20:57:45 +00:00
Selim Cinek
95ddf90349 Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 2015-07-27 20:57:23 +00:00
Fyodor Kupolov
0938a63485 Added android.permission.PEERS_MAC_ADDRESS permission 
This permission is required for Settings to have access to BT/WiFi scan results
even if location is turned off.

Bug: 21852542
Bug: 22728628
Change-Id: I1b527f78077b45a326fd22d9b4ed92f9f806ff49
 2015-07-27 12:31:34 -07:00