PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,573 Commits 1 Branch 0 Tags
b058ba1eb1bf26c8ac1cbf092ea320b07aa9554c
Commit Graph

28573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
c522236cd4 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 am: ee4865ba14 
am: 109d2c5d80

* commit '109d2c5d80cc13b4f9d17660480c93427efa86df':
  Show signal strength indication while in CryptKeeper

Change-Id: I772b2d1a5f3048b9ef65294aa5c92c591ce8f9fd
 2016-05-12 02:45:22 +00:00
Dianne Hackborn
0e3762af4c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 am: c55d3e0ee8 
am: 909e713760

* commit '909e71376033ef48cc463d6a85d17ede78474661':

Change-Id: Ib63c5a8022a21ccd4fabfb404f6ddbeb9460a781
 2016-05-12 02:45:21 +00:00
Dianne Hackborn
7e53eb4710 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 am: c553d79b39 
am: 6a3fea9e78

* commit '6a3fea9e78e9d8cfe46d80e9b6551a219593469c':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I5b66695bc1dbe7c06430277bcd2570a2137376f3
 2016-05-12 02:45:20 +00:00
Jim Miller
02f1d04435 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 
am: 975d4245b3

* commit '975d4245b3a88ccb6e58123f6db1e5898caf79df':

Change-Id: I9c1e09d86e7d023e26900ec9a8a0948b9dc5cff7
 2016-05-12 02:27:04 +00:00
Jim Miller
109d2c5d80 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 
am: ee4865ba14

* commit 'ee4865ba1484a5da8a2d2022dfc1b4a4c3fedd9e':
  Show signal strength indication while in CryptKeeper

Change-Id: I1f38358b45ef9f4043692860df0c194ab1ad8d61
 2016-05-12 02:23:54 +00:00
Jim Miller
975d4245b3 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev 
am: 3086911e25

* commit '3086911e2578ca7391c46f230edfb0f968dec38e':
  Show signal strength indication while in CryptKeeper

Change-Id: I68e310a264404efe0f2839d6047e091925da8cb1
 2016-05-12 02:12:54 +00:00
Jim Miller
ee4865ba14 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev 
am: 3086911e25

* commit '3086911e2578ca7391c46f230edfb0f968dec38e':
  Show signal strength indication while in CryptKeeper

Change-Id: If8dcd37239bc2aedeb4fcc97da715c21b4d53639
 2016-05-12 02:06:50 +00:00
Jim Miller
3086911e25 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev 2016-05-12 01:52:34 +00:00
Dianne Hackborn
909e713760 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 
am: c55d3e0ee8

* commit 'c55d3e0ee88dc8a062d9fae96b5a129c7936f220':

Change-Id: Iccc8edd8b5cefdfde26a907ec969328b3494f8ef
 2016-05-12 01:14:41 +00:00
Dianne Hackborn
6a3fea9e78 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 
am: c553d79b39

* commit 'c553d79b39fc819279a57bd31e14b3cf9acb6a18':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I8f828474689daad2e300bcb22b3a32b04af1f8fa
 2016-05-12 01:12:44 +00:00
Dianne Hackborn
c553d79b39 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 
am: 2dec0c7839

* commit '2dec0c7839784940601df3f2110a552a5cf73400':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I6d31dd4cd2dc9c56bb0ee131e7de667d3e5cb6de
 2016-05-12 00:51:45 +00:00
Dianne Hackborn
c55d3e0ee8 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 
am: 2dec0c7839

* commit '2dec0c7839784940601df3f2110a552a5cf73400':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4
 2016-05-12 00:51:36 +00:00
Dianne Hackborn
2dec0c7839 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:16 +00:00
Daniel Nishi
2186893b8f Entries in the Deletion Helper should be default unchecked. 
Bug: 28669483
Change-Id: I88395db46ffb42b757468936bcdf555bb90c0e75
 2016-05-11 15:41:44 -07:00
Maurice Lam
f74cf50ea7 Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev am: 8b649c0558 
am: b0df332c35

* commit 'b0df332c35407f0c73122e6f985336aa54b16e3b':
  Fix truncated text in pattern lock setup

Change-Id: I63f1716713f8cf0766d47f3fef5c685b089be23c
 2016-05-11 21:52:12 +00:00
Sudheer Shanka
262148ecbd Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: 28c44ebf65 
am: 755e6676bc

* commit '755e6676bc572687fce771e0dab78c303b7c2535':

Change-Id: I23afd320cb29f624bc24246c571be08776ff9709
 2016-05-11 21:52:05 +00:00
Sudheer Shanka
f3d130aab9 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: eeeb02fefb 
am: 6c3bff4930

* commit '6c3bff493095ffd1f768c1cac159fc112c3fd351':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: Ie6f897b89986f7e1dcb59a1ceced3ce6ba4ae2a8
 2016-05-11 21:51:48 +00:00
Maurice Lam
df055a4ac2 Set Wi-Fi dialog spinners to 48dps tall 
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.

Also adds scroll indicators to the scroll view.

Bug: 28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
 2016-05-11 14:41:46 -07:00
Dianne Hackborn
a24b836e85 Fix issue #28400000: Settings memory UI still showing z-ram... 
...but probably shouldn't.

Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
 2016-05-11 14:22:05 -07:00
Maurice Lam
b0df332c35 Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev 
am: 8b649c0558

* commit '8b649c055859e9d67353980aaf1dd2c62bdcfe06':
  Fix truncated text in pattern lock setup

Change-Id: I22db81a7c6ff572d0ebeb7998392da82d98234d2
 2016-05-11 20:14:58 +00:00
Maurice Lam
8b649c0558 Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev 2016-05-11 20:05:18 +00:00
Sudheer Shanka
755e6676bc Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 
am: 28c44ebf65

* commit '28c44ebf65f1d0602b5956a328c1f2886ad92fd3':

Change-Id: Id2feb9a5b493ed2e1a86c6d7911ef4c726c8df8e
 2016-05-11 19:34:14 +00:00
Sudheer Shanka
6c3bff4930 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 
am: eeeb02fefb

* commit 'eeeb02fefbb8d8e3dbe70a8862cf21ac9ac55736':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I46f14c2de931a132cc27bc678293f9e028812758
 2016-05-11 19:22:24 +00:00
Sudheer Shanka
eeeb02fefb Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 
am: 938501cf76

* commit '938501cf7634843460b03b6fe954e927166e1257':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I2aa5788fa98cf5ac128c161fcb0123b26eae1d7b
 2016-05-11 19:14:11 +00:00
Sudheer Shanka
28c44ebf65 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 
am: 938501cf76

* commit '938501cf7634843460b03b6fe954e927166e1257':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
 2016-05-11 19:13:46 +00:00
Sudheer Shanka
938501cf76 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 2016-05-11 19:04:20 +00:00
Jason Monk
095ba6a3bd Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: d88d281304 
am: 78f6921e1f

* commit '78f6921e1f60d5001ca8ee97f718cc2efaba110c':

Change-Id: I6a903fa80bc389848cb5b218d811d341be501c27
 2016-05-11 18:29:13 +00:00
Maurice Lam
e4d0b818fe Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e am: 96aaeafa91 
am: 3a31510fcd

* commit '3a31510fcd0b1ad37a29a8495f1cb98a969cc658':

Change-Id: I3f735d8fa63b7e54153339f46215d8ca477ed43f
 2016-05-11 18:29:01 +00:00
Jason Monk
b1e1e9a9fc Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: 29b86d10d5 
am: 60c6b9d252

* commit '60c6b9d252c6bab3a9a662c614a241784a9f616c':
  Fix unmount up button

Change-Id: I91a6ace7eb4da5deb21c02c581bf96c8344041dc
 2016-05-11 18:28:38 +00:00
Maurice Lam
22a31ae79d Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e -s ours am: ac97181cbc 
am: 7610ed23bd

* commit '7610ed23bd54ef534b1b035b48e213bfcae8cf8d':
  Fix truncated text in pattern lock setup

Change-Id: I8c11ee000471dc555c4ad489d1561b94536f3d4c
 2016-05-11 18:27:39 +00:00
Jason Monk
78f6921e1f Merge "Fix unmount up button" into nyc-dev am: 7680871d92 
am: d88d281304

* commit 'd88d2813043075ad470898f0a053bd04a46bbe8d':

Change-Id: I52319c8d01a6a91d30f632554c24d52b5c1dd277
 2016-05-11 18:23:49 +00:00
Maurice Lam
7b6791d126 Fix truncated text in pattern lock setup 
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.

Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.

Bug: 28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
 2016-05-11 11:23:43 -07:00
Maurice Lam
3a31510fcd Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e 
am: 96aaeafa91

* commit '96aaeafa91f5702ec4c9d630465e03c8c56f4dd9':

Change-Id: I56dee241a7c696464ce0386ee3385327578075d1
 2016-05-11 18:23:43 +00:00
Jason Monk
60c6b9d252 Merge "Fix unmount up button" into nyc-dev am: 7680871d92 
am: 29b86d10d5

* commit '29b86d10d519a1a1620f42b83a0766246e286409':
  Fix unmount up button

Change-Id: Ic666811fad5ed0b5512e9904d46158f61aee819a
 2016-05-11 18:21:09 +00:00
Maurice Lam
7610ed23bd Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e -s ours 
am: ac97181cbc

* commit 'ac97181cbc2e8b980f8cc9dd6615d38faff61dc7':
  Fix truncated text in pattern lock setup

Change-Id: I5e12f0bd4e7353842d681fe306eb2816d4f332cf
 2016-05-11 18:21:02 +00:00
Jason Monk
29b86d10d5 Merge "Fix unmount up button" into nyc-dev 
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I4c803b0664abd85956b724b782820920dced6a31
 2016-05-11 18:18:37 +00:00
Maurice Lam
ac97181cbc Merge "Fix truncated text in pattern lock setup" into nyc-dev 
am: 353cdee69e  -s ours

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I3fb29ac80ad857c15128b14076f0c2bf79375ea1
 2016-05-11 18:18:19 +00:00
Jason Monk
d88d281304 Merge "Fix unmount up button" into nyc-dev 
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I5384e051aa9409b07af2a201f17244e91360003e
 2016-05-11 18:15:38 +00:00
Maurice Lam
96aaeafa91 Merge "Fix truncated text in pattern lock setup" into nyc-dev 
am: 353cdee69e

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I470a2267b051eb394ed95f9c7443786fbf911836
 2016-05-11 18:15:35 +00:00
Jason Monk
7680871d92 Merge "Fix unmount up button" into nyc-dev 2016-05-11 18:04:57 +00:00
Maurice Lam
353cdee69e Merge "Fix truncated text in pattern lock setup" into nyc-dev 2016-05-11 18:04:26 +00:00
Jason Monk
0aed68d6b9 Fix unmount up button 
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
 2016-05-11 13:53:13 -04:00
Jason Monk
43a597b1a7 Merge "Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 2134be3239" into nyc-mr1-dev-plus-aosp 
am: 322938b234

* commit '322938b2340b4ef7fae28b913057dfe964c7ceb4':

Change-Id: Id8ebbffc87af1179980e2f64759b75cee3c665ab
 2016-05-11 16:34:01 +00:00
Jason Monk
5df096c381 Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 3b533b98da 
am: 779584976c

* commit '779584976c66e9836ea676c6b1a75ef43953920a':
  Fix crash in not installed for this user apps

Change-Id: Ie4bd362867be447d5565d6084c8d638c6c11df29
 2016-05-11 16:34:01 +00:00
Android Build Merger (Role)
322938b234 Merge "Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 2134be3239" into nyc-mr1-dev-plus-aosp 2016-05-11 16:31:36 +00:00
Jason Monk
779584976c Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f 
am: 3b533b98da

* commit '3b533b98da67909c66448db99f4e7d239adf2f15':
  Fix crash in not installed for this user apps

Change-Id: I29e5a40715d9d6f5a767fbdfdb46535bf67b23a7
 2016-05-11 16:31:25 +00:00
Jason Monk
df8932b95b Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f 
am: 2134be3239

* commit '2134be3239197f6ebc7372bacf5b1d8f2d49a516':
  Fix crash in not installed for this user apps

Change-Id: I50183afac2db30ac8f0d94b201d44c013469e794
 2016-05-11 16:31:25 +00:00
Jason Monk
2134be3239 Merge "Fix crash in not installed for this user apps" into nyc-dev 
am: a188b2447f

* commit 'a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
  Fix crash in not installed for this user apps

Change-Id: I177bc82e5d9848b9981a6ce0b1948094ae19d420
 2016-05-11 16:28:48 +00:00
Jason Monk
3b533b98da Merge "Fix crash in not installed for this user apps" into nyc-dev 
am: a188b2447f

* commit 'a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
  Fix crash in not installed for this user apps

Change-Id: I98f79dc9c4cb315259c2057fc852237111495051
 2016-05-11 16:28:48 +00:00
Jason Monk
a188b2447f Merge "Fix crash in not installed for this user apps" into nyc-dev 2016-05-11 16:19:04 +00:00