Commit Graph

11636 Commits

Author SHA1 Message Date
Amith Yamasani
c26f261596 am 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '8cfce5de838fb9599b1040840f6bbe164bf9afdb':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 15:58:09 -07:00
Russell Brenner
93e6a023c5 Merge "Set divider color for light theme" into klp-dev 2013-09-27 22:41:33 +00: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
Alan Viverette
c402322a5b Restore default locale in Captioning Settings
BUG: 10967083
Change-Id: Id607a108d3d56a89fcecf345d2e12af88dc38690
2013-09-27 12:22:34 -07:00
Amith Yamasani
8cfce5de83 am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit 'da0e448379ff4bcc778fbbe1f203ec322378244f':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:55:35 -07:00
Amith Yamasani
da0e448379 am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit 'aad8d90ce082d01e6420227572891a2fce65306a':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:51:16 -07:00
Amith Yamasani
aad8d90ce0 am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit 'b4881f79e1c065b40f234710b6fb28acce9e164f':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:46:25 -07:00
Mindy Pereira
28600d29f3 Updated de-blued backgrounds for settings power widget.
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
2013-09-27 11:31:04 -07:00
Amith Yamasani
b4881f79e1 am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '451d8225ef3ae407f52512a93bcf04e6400eb997':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:27:47 -07:00
Amith Yamasani
451d8225ef am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '49187c9418dc2c5f404385596db3d82dd896c178':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:24:28 -07:00
Amith Yamasani
49187c9418 am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '53a56ad89cbd14410dcd8e5755c6765f1a438928':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:20:20 -07:00
Amith Yamasani
53a56ad89c am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '447415f4f17dc91d3844394625f4e6fa10efedad':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:18:04 -07:00
Amith Yamasani
447415f4f1 am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '7870850387dabd32a54e3fca7d65dea5f45a9a16':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:14:30 -07:00
Amith Yamasani
7870850387 am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '77aa51e5b7261638590af1d69ac03f4c8cd25692':
  Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:10:37 -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
b4c83de0b3 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

Conflicts:
	res/values/donottranslate.xml
2013-09-26 16:38:31 -07:00
Russell Brenner
2ef377d47d Set divider color for light theme
Bug: 10928581
Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
2013-09-26 16:07:52 -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
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
077f83a22c Merge "Latest UX for Tap & pay." into klp-dev 2013-09-26 17:57:47 +00:00
Mindy Pereira
873c372323 Merge "Updated de-blued backgrounds for settings power widget." into klp-dev 2013-09-26 17:49:40 +00:00
The Android Automerger
2e85c354b0 merge in klp-release history after reset to klp-dev 2013-09-26 06:02:03 -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
77aa51e5b7 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 17:11:34 -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
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
083e6cc012 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 19:58:58 +00: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
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
The Android Automerger
d504c4c6f0 merge in klp-release history after reset to klp-dev 2013-09-25 06:02:40 -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
162b014cea Merge "Add Jakarta timezone" into klp-dev 2013-09-24 21:49:54 +00:00
Baligh Uddin
0865ffb32d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 21:27:51 +00:00
Christopher Tate
254975aac1 Merge "Use a generic icon for Home" into klp-dev 2013-09-24 18:44:14 +00:00
The Android Automerger
3bc0c035e4 merge in klp-release history after reset to klp-dev 2013-09-24 06:01:54 -07:00
Matthew Xie
500f2941a0 Add Bluetooth Privileged permission to use pairing apis
bug 9987787

Change-Id: I8d3b29c36a39ed00618b0ab7ef4f2a4ae14c4116
2013-09-24 01:13:05 -07:00
Jeff Sharkey
d572a03ad8 Use a generic icon for Home
It's only a *foolish* consistency that is the hobgoblin of
little minds.

Bug 10849877

Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af
2013-09-23 17:48:37 -07:00
David Christie
4fff3d9b9d Merge "Don't show background apps in Settings->Location (b/10806272)" into klp-dev 2013-09-24 00:18:39 +00:00
Sungmin Choi
d3b9dc6356 Add Jakarta timezone
Bug: 10198358
Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
2013-09-23 16:10:03 -07:00
David Christie
b1e381be21 Don't show background apps in Settings->Location (b/10806272)
Change-Id: I7ed0249bbc4509e4116dfc88181faccde60365e1
2013-09-23 15:52:24 -07:00
Edward Jee
46c746551f Once the user allows PBAP phonebook access, do not ask again.
Bug: 9876209
Change-Id: I8d9dcfa03e8d85577af4c4664fa34b3830e3d8f6
2013-09-23 15:21:27 -07:00