PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,923 Commits 1 Branch 0 Tags
b0d1d2d53ef556adef7a7f70ad9aba12d62d15a9
Commit Graph

6451 Commits

Author SHA1 Message Date
John Spurlock
3bdf643a3d am 5cd144af: am 1e8a9f5f: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '5cd144afc66f99b4cd789286160fce38072a7d01':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:46:19 +00:00
John Spurlock
1e8a9f5fd3 am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:16:12 +00:00
John Spurlock
0423aed775 Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 2015-04-29 14:02:55 +00:00
Geoff Mendal
3141270a1e Import translations. DO NOT MERGE 
Change-Id: If39a43ecd48ea382144660b0c47e864b014b239e
Auto-generated-cl: translation import
 2015-04-29 08:11:54 -05:00
Martijn Coenen
a570479c71 am 3ef56acd: am a0ee97f1: am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '3ef56acd622778f8f8582bb2fc0c27fcd6973809':
  New Tap & Pay UX.
 2015-04-29 08:04:15 +00:00
Martijn Coenen
a0ee97f196 am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '01d13c043a7d9f2aef357e17f2d6a36c678006e6':
  New Tap & Pay UX.
 2015-04-29 07:41:50 +00:00
Martijn Coenen
01d13c043a Merge "New Tap & Pay UX." into mnc-dev 2015-04-29 07:29:32 +00:00
Jeff Sharkey
033e3af21b am 9fd5ce62: am 6e86616d: am a16257db: Format as public/private; follow refactoring. 
* commit '9fd5ce625a1c85db2269030382da06fe056180a8':
  Format as public/private; follow refactoring.
 2015-04-29 05:52:56 +00:00
Jeff Sharkey
6e86616df7 am a16257db: Format as public/private; follow refactoring. 
* commit 'a16257dbd5599135320f4263a2cb438b7a469084':
  Format as public/private; follow refactoring.
 2015-04-29 05:29:52 +00:00
Jeff Sharkey
a16257dbd5 Format as public/private; follow refactoring. 
Offer to format an empty disk as public/private.

Bug: 19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
 2015-04-28 21:54:54 -07:00
Elliott Hughes
90f9bed6d4 am 28077b9c: Add Pacific/Noumea. 
* commit '28077b9cc86388f9b5dfa29a79a5a42c3d545d29':
  Add Pacific/Noumea.
 2015-04-29 01:43:09 +00:00
Jorim Jaggi
8f476cdace am 441ea80d: Add animation for fingerprint icon 
* commit '441ea80d0ac874955ca7a83ddb8d140ccf87f7ab':
  Add animation for fingerprint icon
 2015-04-29 01:41:14 +00:00
Elliott Hughes
7e1bbeee65 am fae9ca8c: am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'fae9ca8cd505df1b97679f7bafd0621eb9ccf2ec':
  Add Pacific/Noumea.
 2015-04-28 21:53:31 +00:00
Elliott Hughes
fae9ca8cd5 am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'a9657f553d2db21f99f1129cb18490d7e2497b31':
  Add Pacific/Noumea.
 2015-04-28 21:33:52 +00:00
Elliott Hughes
28077b9cc8 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

(cherry-pick of 23ae8827c1bd86ec632eab42d067148f8b3452e8.)

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:59:54 -07:00
Elliott Hughes
23ae8827c1 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:35:25 -07:00
Jorim Jaggi
441ea80d0a Add animation for fingerprint icon 
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.

Bug: 20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
(cherry picked from commit 2c2a41669f)
 2015-04-28 19:20:59 +00:00
Jorim Jaggi
d2931b321c Merge "Add animation for fingerprint icon" 2015-04-28 19:20:50 +00:00
John Spurlock
8881120246 Settings: "No interruptions" -> "Total silence" 
Bug: 20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
 2015-04-28 15:36:50 +00:00
Sudheer Shanka
d188c68094 am f1fa3c7a: am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. 
* commit 'f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
  Update warning dialog on work profile deletion.
 2015-04-28 15:27:25 +00:00
Alan Viverette
9beaa1791b am d508cd9b: am fb7827f3: am d4988442: Point to Material.Settings themes 
* commit 'd508cd9b6f7d7e567d1989be4b365bfee0112704':
  Point to Material.Settings themes
 2015-04-28 15:27:21 +00:00
Sudheer Shanka
3ad534aa84 am bc956309: Update warning dialog on work profile deletion. 
* commit 'bc95630994227736aff46885ca1d9345829e83e2':
  Update warning dialog on work profile deletion.
 2015-04-28 13:51:55 +00:00
Sudheer Shanka
bc95630994 Update warning dialog on work profile deletion. 
Bug: 20024761
Change-Id: I23b0eaa7742d9d23a29a2a48ab6e3d92fe310560
 2015-04-28 11:32:09 +00:00
Martijn Coenen
fe58b534f6 New Tap & Pay UX. 
Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
 2015-04-28 08:17:22 +00:00
Geoff Mendal
79670bbe68 Import translations. DO NOT MERGE 
Change-Id: I5f859b65d600018c5dc8cf650e5a7f701609acff
Auto-generated-cl: translation import
 2015-04-27 23:16:11 -07:00
Alan Viverette
fb7827f3be am d4988442: Point to Material.Settings themes 
* commit 'd4988442cbdf287e9856c3c00dad662e1ab36d2b':
  Point to Material.Settings themes
 2015-04-27 23:43:58 +00:00
Alan Viverette
d4988442cb Point to Material.Settings themes 
Bug: 20546201
Change-Id: Ib6d480d12261101c2e240b23163195ff006a41bd
 2015-04-27 23:20:18 +00:00
Jorim Jaggi
8013426679 am 4a2423ba: Move fingerprint enroll logic into sidecar fragment 
* commit '4a2423ba5eeee22d38942ead60bfd3bb13f44655':
  Move fingerprint enroll logic into sidecar fragment
 2015-04-27 21:57:20 +00:00
Jorim Jaggi
4a2423ba5e Move fingerprint enroll logic into sidecar fragment 
So enroll can continue across configuration changes.

Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
(cherry picked from commit 64e9c4cb2c)
 2015-04-27 21:16:22 +00:00
Jorim Jaggi
2c2a41669f Add animation for fingerprint icon 
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.

Bug: 20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
 2015-04-27 14:03:50 -07:00
Jason Monk
8233790370 am 5e1e2023: am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
* commit '5e1e20237d3fbc0c1201e27bbd9fa7e21be0c430':
  Move process stats screen into memory screen.
 2015-04-27 21:03:39 +00:00
Jorim Jaggi
88ca297352 Merge changes I021f2f3e,Iec6788d4 
* changes:
  Move fingerprint enroll logic into sidecar fragment
  Allow incremental builds for settings.
 2015-04-27 19:23:29 +00:00
Jorim Jaggi
64e9c4cb2c Move fingerprint enroll logic into sidecar fragment 
So enroll can continue across configuration changes.

Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
 2015-04-27 12:22:23 -07:00
Jason Monk
e5f7ba7f74 am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
* commit '70c5472fe276bf7a272558450fb87f91f9d286ee':
  Move process stats screen into memory screen.
 2015-04-27 14:53:02 +00:00
Jason Monk
70c5472fe2 Merge "Move process stats screen into memory screen." into mnc-dev 2015-04-27 14:37:02 +00:00
Geoff Mendal
d1b9edab3a Import translations. DO NOT MERGE 
Change-Id: I975ff3310d078dff27ab1d65811cb7026bb968e8
Auto-generated-cl: translation import
 2015-04-27 09:14:56 -05:00
Jason Monk
2583fc1e06 Move process stats screen into memory screen. 
- Move process stats from developer options to top level
   settings item.
 - Some minor UI changes to the top of the page
 - Major UI updates to detail page, now shows info with processes
   as pref categories and services as prefs, with a way to kill
   them (taken from Running Services page).
 - Some major refactorings in code, in attempt to make it more
   usable
 - Added color bar on per app basis to visualize the avg/max
   relationship
 - Updated the way avg is calculated across multiple entries in
   ProcStatsPackageEntry to be more accurate
 - Change the way max memory is calculated in
   ProcStatsPackageEntry to be less accurate but more useful

Bug: 19443802
Change-Id: Ia6aaabe42c415c50997a09bfb814a6f6e5731772
 2015-04-27 10:08:52 -04:00
Geoff Mendal
14e0f9a719 Import translations. DO NOT MERGE 
Change-Id: Ia3d3128b802381b02f29a980d3fd4bc4d7e19b42
Auto-generated-cl: translation import
 2015-04-27 08:26:38 -05:00
Geoff Mendal
c5184ff1af Import translations. DO NOT MERGE 
Change-Id: I1ac8f78379eb67ddf2f5d6e92825424dd1aeb23a
Auto-generated-cl: translation import
 2015-04-26 18:36:59 -07:00
Geoff Mendal
23562e4605 Import translations. DO NOT MERGE 
Change-Id: I05bb4f3a511b9b620bb9fbcf0a9be40ece9eb0ad
Auto-generated-cl: translation import
 2015-04-25 00:12:23 -07:00
Etan Cohen
a0128ff0bf Merge changes from topic 'mwd-merge-042415' 
* changes:
  Merge commit '377c7c9' into merge2
  Merge commit '22ffff6' into merge2
 2015-04-25 00:51:57 +00:00
Etan Cohen
a09725c513 Merge commit '377c7c9' into merge2 2015-04-24 14:39:03 -07:00
Jorim Jaggi
817178fda2 Merge changes from topic 'fingerprint_ui' 
* changes:
  Add dialog when user touches fingerprint icon
  Add pulsing animation for find sensor.
  Update fingerprint enroll UI to spec.
 2015-04-24 21:34:39 +00:00
Jorim Jaggi
3b7f2efd95 Add dialog when user touches fingerprint icon 
Bug: 20495507
Change-Id: I6779aba7ca988fd9a8eee07afca2a410de144a26
 2015-04-24 14:26:44 -07:00
Jorim Jaggi
2fef19dd16 Add pulsing animation for find sensor. 
Bug: 20495507
Change-Id: I5fefb2cdb2625885c906fa2a9b69da1141ce66e0
 2015-04-24 14:26:32 -07:00
Jorim Jaggi
5ad75f07b1 Update fingerprint enroll UI to spec. 
Also adds sliding animations between the steps.

Bug: 20495507
Change-Id: I148d8d8b8082361149f02fd2dc4cead0ba3e2526
 2015-04-24 14:26:15 -07:00
Alan Viverette
13f8303086 am 4a4f487e: am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries" 
* commit '4a4f487e5bfd88644421fd139735543b4a5c7be9':
  Settings: Fix wifi developer options summaries
 2015-04-24 21:08:07 +00:00
Alan Viverette
4a4f487e5b am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries" 
* commit 'b6073c486cb2eb537fd6e53000dce55afe762fc1':
  Settings: Fix wifi developer options summaries
 2015-04-24 18:41:05 +00:00
Alan Viverette
b6073c486c am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries" 
* commit '93ecb1f0124da17c55ad52fe572eaf4a8c3868d5':
  Settings: Fix wifi developer options summaries
 2015-04-24 18:28:50 +00:00
Alan Viverette
93ecb1f012 Merge "Settings: Fix wifi developer options summaries" 2015-04-24 18:05:10 +00:00