PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,772 Commits 1 Branch 0 Tags
a5326d11eaf58e1f9b78af6dcdd248ef6a2fa00c
Commit Graph

11772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
a5326d11ea am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev 
* commit '86f74d2ad407214e23a717f2f24046ce9a89ea48':
  Tap & pay: change empty state UX and strings.
 2013-09-30 14:16:40 -07:00
Svetoslav
2141b08e09 am 8181c816: Merge "Add icons to the printer list items in settings." into klp-dev 
* commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
  Add icons to the printer list items in settings.
 2013-09-30 14:13:49 -07:00
Lifu Tang
dc9adfa973 am 4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev 
* commit '4ba66781f30c7d96274bbf4b6395838495fea399':
  Hacked to display Puzzle icon for GCore
 2013-09-30 14:13:20 -07:00
Lifu Tang
29557e64d2 am 2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev 
* commit '2f78d82ab3a2858b3265cf01099db455fb43f4b1':
  Don't show help menu when browser unavailable
 2013-09-30 14:13:20 -07:00
Martijn Coenen
86f74d2ad4 Merge "Tap & pay: change empty state UX and strings." into klp-dev 2013-09-27 22:37:37 +00:00
Martijn Coenen
b412e18296 Tap & pay: change empty state UX and strings. 
Bug: 10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
 2013-09-27 14:51:46 -07:00
Svetoslav
8181c8166f Merge "Add icons to the printer list items in settings." into klp-dev 2013-09-27 02:25:36 +00:00
Svetoslav
a749adae03 Add icons to the printer list items in settings. 
bug:10955751

Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
 2013-09-26 18:56:27 -07:00
Lifu Tang
4ba66781f3 Merge "Hacked to display Puzzle icon for GCore" into klp-dev 2013-09-27 00:18:22 +00:00
Lifu Tang
2f78d82ab3 Merge "Don't show help menu when browser unavailable" into klp-dev 2013-09-27 00:17:54 +00:00
Svetoslav Ganov
40f946ad89 am 2a2fcdd6: am bc2c3db8: Add print job settings screen. 
* commit '2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4':
  Add print job settings screen.
 2013-09-26 14:18:21 -07:00
Svetoslav Ganov
2a2fcdd6db am bc2c3db8: Add print job settings screen. 
* commit 'bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23':
  Add print job settings screen.
 2013-09-26 14:14:55 -07:00
Svetoslav Ganov
bc2c3db8f9 Add print job settings screen. 
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.

bug:10935736

Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
 2013-09-26 13:58:59 -07:00
Martijn Coenen
9ccde1132c am 01aa7930: am 077f83a2: Merge "Latest UX for Tap & pay." into klp-dev 
* commit '01aa7930306e15ba4ce942844506e42df85a0a04':
  Latest UX for Tap & pay.
 2013-09-26 11:05:48 -07:00
Lifu Tang
9335f14082 Hacked to display Puzzle icon for GCore 
- Fix b/10856957

Change-Id: I0716c9f5c6d818cd38dfc30a6b0b29deaa994367
 2013-09-26 11:01:14 -07:00
Martijn Coenen
01aa793030 am 077f83a2: Merge "Latest UX for Tap & pay." into klp-dev 
* commit '077f83a22c3d9b8650b2ba4dab4f17e55fde59fb':
  Latest UX for Tap & pay.
 2013-09-26 11:00:49 -07:00
Martijn Coenen
077f83a22c Merge "Latest UX for Tap & pay." into klp-dev 2013-09-26 17:57:47 +00:00
Mindy Pereira
2da0c7cc14 am ff91e56f: am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev 
* commit 'ff91e56f8b17f4f986dd5512c3e7444875f2427f':
  Updated de-blued backgrounds for settings power widget.
 2013-09-26 10:52:26 -07:00
Mindy Pereira
ff91e56f8b am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev 
* commit '873c3723233f3fffd2ccd58041579bcd454d1e55':
  Updated de-blued backgrounds for settings power widget.
 2013-09-26 10:50:51 -07:00
Mindy Pereira
873c372323 Merge "Updated de-blued backgrounds for settings power widget." into klp-dev 2013-09-26 17:49:40 +00:00
Baligh Uddin
feecc86691 Merge "Import translations. DO NOT MERGE" 2013-09-26 04:03:25 +00:00
Baligh Uddin
ac9b068726 Import translations. DO NOT MERGE 
Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152
Auto-generated-cl: translation import
 2013-09-25 20:31:24 -07:00
Lifu Tang
66d879ce9f Don't show help menu when browser unavailable 
- Fix b/10860551

Change-Id: I71d073ef96d406f1705672d7ccf75337e5250ec6
 2013-09-25 17:49:00 -07:00
Amith Yamasani
471afcacac am d5e430b5: am cb407569: Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev 
* commit 'd5e430b59a991e5d8e54b20be896c07434d56954':
  Make sure that external callers cannot pass in the confirm bypass extra
 2013-09-25 16:57:48 -07:00
Amith Yamasani
d5e430b59a am cb407569: Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev 
* commit 'cb407569b35d0605ffedfd6c00ee9a88c8da3aa4':
  Make sure that external callers cannot pass in the confirm bypass extra
 2013-09-25 16:52:45 -07:00
Amith Yamasani
cb407569b3 Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev 2013-09-25 23:48:34 +00:00
Mindy Pereira
8431988aaf Updated de-blued backgrounds for settings power widget. 
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
 2013-09-25 16:37:55 -07:00
Martijn Coenen
0e940d6c00 Latest UX for Tap & pay. 
Bug: 10862185
Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
 2013-09-25 15:01:24 -07:00
Amith Yamasani
66026773bb Make sure that external callers cannot pass in the confirm bypass extra 
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.

Also, make sure that the fragments are launched with the correct corresponding
activity.

Bug: 9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
 2013-09-25 14:05:33 -07:00
Rob Tsuk
306d52afb6 am 90a51e2b: am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev 
* commit '90a51e2bf9c61a80ebc79f6c9ad5e7b774860bfc':
  Replace blue pressed feedback with gray.
 2013-09-25 14:00:52 -07:00
Rob Tsuk
90a51e2bf9 am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev 
* commit 'e57248e5f63172a5c78184ff9c885c823cb1dae8':
  Replace blue pressed feedback with gray.
 2013-09-25 13:55:04 -07:00
Rob Tsuk
e57248e5f6 Merge "Replace blue pressed feedback with gray." into klp-dev 2013-09-25 20:52:04 +00:00
Rob Tsuk
1fa7880c86 Replace blue pressed feedback with gray. 
Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
 2013-09-25 13:16:59 -07:00
Baligh Uddin
6cc6f89101 am c2314e32: (-s ours) am 083e6cc0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c2314e3229861a483b67b03dda2f9425b3b5cc68':
  Import translations. DO NOT MERGE
 2013-09-25 13:03:09 -07:00
Baligh Uddin
c2314e3229 am 083e6cc0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '083e6cc01276ab4feb9bb060d4f830cddbccff69':
  Import translations. DO NOT MERGE
 2013-09-25 13:01:48 -07:00
Baligh Uddin
083e6cc012 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 19:58:58 +00:00
Brian Carlstrom
ce38686748 am 594ffa25: am 372b6f74: Enable runtime selection for art for user builds 
* commit '594ffa25b068d79eaad43a1eb1636d79d508151a':
  Enable runtime selection for art for user builds
 2013-09-25 11:30:14 -07:00
Brian Carlstrom
594ffa25b0 am 372b6f74: Enable runtime selection for art for user builds 
* commit '372b6f74b17fe1ef207bcda511dd71a93f792682':
  Enable runtime selection for art for user builds
 2013-09-25 11:28:35 -07:00
Brian Carlstrom
372b6f74b1 Enable runtime selection for art for user builds 
Bug: 10069754
Change-Id: I4b9780b52d3aac900e5d4da629e3e6b22c3cb323
 2013-09-25 11:22:19 -07:00
Dave Burke
c666d2c36b am f3a0ce28: am 64b28a0d: Disable AppOps for real. 
* commit 'f3a0ce28ba5c276a74bbd76b44ce5d421aac4812':
  Disable AppOps for real.
 2013-09-25 10:38:19 -07:00
Dave Burke
f3a0ce28ba am 64b28a0d: Disable AppOps for real. 
* commit '64b28a0dcc174827e551f4c7e71e4268bd0f5bba':
  Disable AppOps for real.
 2013-09-25 10:35:03 -07:00
Dave Burke
64b28a0dcc Disable AppOps for real. 
Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1
 2013-09-25 09:56:58 -07:00
Baligh Uddin
a4d1b88707 Import translations. DO NOT MERGE 
Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871
Auto-generated-cl: translation import
 2013-09-25 09:55:18 -07:00
Edward Jee
5fb79db91b am 1146695e: am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev 
* commit '1146695e4b94dd3ea987f942ed8fd86d39a859ce':
  Once the user allows PBAP phonebook access, do not ask again.
 2013-09-24 15:29:37 -07:00
Edward Jee
1146695e4b am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev 
* commit '5ad8bf0700cf3297773617e14456d82bbc8f9585':
  Once the user allows PBAP phonebook access, do not ask again.
 2013-09-24 15:26:23 -07:00
Edward Jee
5ad8bf0700 Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev 2013-09-24 22:23:26 +00:00
Amith Yamasani
7c84c7f422 am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp 
* commit '7dcd20f9a6877342a92d0e42c1692a25429960f5':
  Add Jakarta timezone
 2013-09-24 15:05:02 -07:00
Amith Yamasani
7dcd20f9a6 resolved conflicts for merge of 162b014c to klp-dev-plus-aosp 
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
 2013-09-24 14:59:11 -07:00
Amith Yamasani
162b014cea Merge "Add Jakarta timezone" into klp-dev 2013-09-24 21:49:54 +00:00
Baligh Uddin
2a9ea16846 am 786f7eca: (-s ours) am 0865ffb3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '786f7eca41edbb4cca7b47b0937049751b345913':
  Import translations. DO NOT MERGE
 2013-09-24 14:35:21 -07:00