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

7021 Commits

Author SHA1 Message Date
Jeff Sharkey
42ef2461b9 am b06835d1: am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev 
* commit 'b06835d19eb5d2e416cf85604746388a754c42e9':
  Slow dialog string has no limit.
 2015-06-11 17:09:30 +00:00
Lorenzo Colitti
fbc3f62e7e am 25566a38: am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 
* commit '25566a38ce9c6f2fb32745c9ece82528b5c30478':
  Add a string for switching to cell when Wi-Fi loses backhaul.
 2015-06-11 17:07:47 +00:00
Jeff Sharkey
b06835d19e am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev 
* commit 'fae37744b1c70b2b7114eaaea500c8baeef5104a':
  Slow dialog string has no limit.
 2015-06-11 16:47:38 +00:00
Jeff Sharkey
fae37744b1 am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev 
* commit '0f6b243d4b0d2224b26852a4801d444afc9289d8':
  Slow dialog string has no limit.
 2015-06-11 16:35:06 +00:00
Jeff Sharkey
0f6b243d4b Merge "Slow dialog string has no limit." into mnc-dev 2015-06-11 16:20:23 +00:00
Jeff Sharkey
9b0d09914b Slow dialog string has no limit. 
Bug: 21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
 2015-06-11 09:18:00 -07:00
Lorenzo Colitti
25566a38ce am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 
* commit 'aab0a7781bf42d1e4ee9002749dfad55d25781f1':
  Add a string for switching to cell when Wi-Fi loses backhaul.
 2015-06-11 12:52:11 +00:00
Selim Cinek
38b48086bc am a9f19dea: am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 
* commit 'a9f19dea4472a76d7c6ec280ff1a0da6a7e64c0e':
  Added setting strings for new fingerprint introduction screen
 2015-06-11 05:56:19 +00:00
Jeff Sharkey
59adbd9027 am 72723306: am d10261eb: am 3803d91a: New strings! 
* commit '72723306a18b4148240e98bff8cb0f78004d76e7':
  New strings!
 2015-06-11 05:56:16 +00:00
Lajos Molnar
8f45270634 am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 05:56:12 +00:00
Lorenzo Colitti
aab0a7781b am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 
* commit '1fdbbffceda141404ae033a471bea20de8df60d4':
  Add a string for switching to cell when Wi-Fi loses backhaul.
 2015-06-11 03:19:06 +00:00
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Selim Cinek
a9f19dea44 am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 
* commit '01dc50f54db68a3e48204bf858ae0acf95794bac':
  Added setting strings for new fingerprint introduction screen
 2015-06-11 02:53:19 +00:00
Jeff Sharkey
72723306a1 am d10261eb: am 3803d91a: New strings! 
* commit 'd10261eb7bafbce83cb9b106b515799edd2b7e8a':
  New strings!
 2015-06-11 02:53:16 +00:00
Lajos Molnar
204f4068f7 am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 02:53:15 +00:00
Jorim Jaggi
6dd8e039da am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit 'a66b907b1610ad67fd8c9b5746fa579bf886825c':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 02:53:13 +00:00
Selim Cinek
01dc50f54d am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 
* commit 'ff702a29ab221b67b97b140263af19ebfecc1988':
  Added setting strings for new fingerprint introduction screen
 2015-06-11 01:34:23 +00:00
Jason Monk
25326207d3 am 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit '68ce17ff25b497edb7e0ec20a672475b76e604c8':
  New dialog for ignore battery optimizations
 2015-06-11 01:34:07 +00:00
Jason Monk
19291d5a89 am efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning 
* commit 'efb955f3f5689062da6e326c6277e1a3758d5436':
  Add string for profile owner usage access warning
 2015-06-11 01:34:06 +00:00
Jeff Brown
56dd84cb61 am c568dab6: am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev 
* commit 'c568dab675e3024c64f9be47f7831181b8889d20':
  Add simulated 4K display modes.
 2015-06-11 01:34:05 +00:00
Jeff Sharkey
d10261eb7b am 3803d91a: New strings! 
* commit '3803d91abb1e6eb034656b202bbb4aa29afa98ba':
  New strings!
 2015-06-11 01:33:32 +00:00
Lajos Molnar
f7192038dc am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit '63504d832672c0738604410d3c309a563114b81e':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 01:32:51 +00:00
Jorim Jaggi
a66b907b16 am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit 'ed76e59e49657e6a49d140bfea8ddd764e5ba731':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 01:32:31 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen 
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
 2015-06-10 18:08:16 -07:00
Jeff Sharkey
3803d91abb New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
 2015-06-10 16:47:52 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Jason Monk
68ce17ff25 am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit '3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
  New dialog for ignore battery optimizations
 2015-06-10 23:15:28 +00:00
Jason Monk
efb955f3f5 am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning 
* commit 'ef77eb2ecc96936854d5b3473591dfaca16e0ae7':
  Add string for profile owner usage access warning
 2015-06-10 23:15:05 +00:00
Jeff Brown
c568dab675 am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev 
* commit 'f7b9a0217cc0cfb0bb35811465a560fad8cf8786':
  Add simulated 4K display modes.
 2015-06-10 23:14:44 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2) 
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
 2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings 
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
 2015-06-10 15:00:13 -07:00
Paul Crowley
6904e5fa9c Add ellipsis to "Starting Android". 
Bug: 20518822
Change-Id: I04f8380ca585680901a65b0741456f5ff44b3c0a
 2015-06-10 22:25:46 +01:00
Jason Monk
3de2cf4b2f am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit 'd09be7ed30d2ed4f3298c3075f506612b91a5878':
  New dialog for ignore battery optimizations
 2015-06-10 20:14:34 +00:00
Jason Monk
d09be7ed30 Merge "New dialog for ignore battery optimizations" into mnc-dev 2015-06-10 20:06:12 +00:00
Jason Monk
ef77eb2ecc am f8d131e1: Add string for profile owner usage access warning 
* commit 'f8d131e181a273ed8664222e754b10a5824d56ac':
  Add string for profile owner usage access warning
 2015-06-10 19:55:01 +00:00
Jason Monk
3a90d7cc69 New dialog for ignore battery optimizations 
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
 2015-06-10 15:49:36 -04:00
Jeff Brown
f7b9a0217c am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev 
* commit 'f8f9088a6def1186038c35ec3319113262825f20':
  Add simulated 4K display modes.
 2015-06-10 19:33:02 +00:00
Jason Monk
f8d131e181 Add string for profile owner usage access warning 
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
 2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +00:00
Xiyuan Xia
beba0efa14 am 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit '67b438b1185f6d11712ee9c962066c1651479507':
  Implement default assist app setting
 2015-06-10 17:47:59 +00:00
Xiyuan Xia
67b438b118 am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit 'a218ebb090e3ac06d5c324bafb89e2d4d3ef7741':
  Implement default assist app setting
 2015-06-10 17:32:43 +00:00
Xiyuan Xia
a218ebb090 am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit '9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
  Implement default assist app setting
 2015-06-10 17:21:01 +00:00
Makoto Onuki
b5fcfcafac am 2f951024: am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev 
* commit '2f951024e40b9bc2662aa5ef53a4544f769999e9':
  Show list of permissions instead of just numbers
 2015-06-10 17:21:00 +00:00
Lorenzo Colitti
335afcbb6c am 24f48299: am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev 
* commit '24f4829994e047b1674fdf66c1dad51bcaf900d7':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 17:13:29 +00:00
Jason Monk
774ae1cf37 am 8ff3e055: am fba2680e: am f9402321: Fix legal info back button 
* commit '8ff3e055b09c03295b87654d7bf3430e792772ce':
  Fix legal info back button
 2015-06-10 17:13:27 +00:00
Jason Monk
b73d3a1811 am 68da427f: am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries 
* commit '68da427f481f24c8c0f571f7915620f7c83c6912':
  Remove periods from ignore optimizations summaries
 2015-06-10 17:13:01 +00:00
Jason Monk
ef2dadb7f8 am 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '6dc33a5ac7a2352be62b75edf1afc399821b38af':
  Advanced apps updates (2/2)
 2015-06-10 17:13:00 +00:00