drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,827 Commits 1 Branch 0 Tags
Commit Graph

151827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device. 
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
 2014-09-26 15:18:20 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active 
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
 2014-09-26 14:53:06 -07:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis 
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
 2014-09-26 13:38:12 -07:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
John Spurlock
245bd4ec8a Merge "Avoid dozing in car mode." into lmp-dev 2014-09-26 20:09:58 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
John Spurlock
bd721cafc4 Merge "Touch-exploration improvements to volume dialog." into lmp-dev 2014-09-26 19:58:45 +00:00
Kevin Ma
17a757d9be am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '938ff081a61d31e5eefca7cee582002aea1c06ff':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:52:06 +00:00
Kevin Ma
938ff081a6 am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:43:39 +00:00
Dave Burke
6bf7be3b75 Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 2014-09-26 19:33:27 +00:00
Dan Sandler
22ef3ed305 Merge "Don't start the keyguard until boot is done." into lmp-dev 2014-09-26 19:32:26 +00:00
Jérôme Poichet
d29c902f98 Revert "Fix memory leak where we close the descriptor instead of the file." 
This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.

Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
 2014-09-26 18:59:11 +00:00
Kevin Ma
18037f14e8 Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 2014-09-26 18:52:25 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths"" 
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
 2014-09-26 18:51:16 +00:00
Alan Viverette
a0f63c6e95 Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 2014-09-26 18:45:26 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints... 
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
 2014-09-26 11:28:01 -07:00
John Spurlock
a0457c2e92 Touch-exploration improvements to volume dialog. 
- Extend the dismiss timeout when interacting with various
   subcontrols.
 - Ensure "hover" events in touch exploration extend the timeout
   in addition to touch events.
 - Introduce new helper to standardize interaction callbacks.
 - Announce zen toasts.
 - Announce zen condition selections, and when existing countdown
   conditions are modified.

Bug:17578434
Change-Id: I8a055b3455aa8d20ba93439bdec6cc75db97800e
 2014-09-26 14:17:09 -04:00
Michael Wright
1b409bcfb8 Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 2014-09-26 18:13:55 +00:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +00:00
Paul Lawrence
3cedef53ce Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev 2014-09-26 17:58:26 +00:00
Jorim Jaggi
e51b21a81e Merge "Don't preload task description icons when opening recents" into lmp-dev 2014-09-26 17:57:05 +00:00
Alan Viverette
5004032ebc Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD 
BUG: 17646144
Change-Id: I58c111d86224dc8f7f557073c0bcbc22ad74aa1b
 2014-09-26 10:37:30 -07:00
Paul Lawrence
95cce9f382 Don't set dev.bootcomplete until interacting with user 
Specifically we want to not set it when encrypting and showing
progress.

Bug: 17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
 2014-09-26 10:16:45 -07:00
Selim Cinek
17580af3cb Merge "Fixed a bug where the QS could get stuck" into lmp-dev 2014-09-26 17:14:17 +00:00
Raph Levien
c8ffeeca67 Merge "Defer spelling correction with apostrophe" into lmp-dev 2014-09-26 17:12:49 +00:00
Selim Cinek
1fdd65e204 Fixed a bug where the QS could get stuck 
Bug: 17655858
Change-Id: I099b07504617670101b10bcbaf9fcb42cee23a1c
 2014-09-26 19:05:50 +02:00
Jorim Jaggi
bdd4b201e4 Don't preload task description icons when opening recents 
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
 2014-09-26 19:00:05 +02:00
Jason Monk
5eeebf5c29 Don't start the keyguard until boot is done. 
Create the KeyguardServiceDelegate but don't bind until boot is done.
Until the keyguard is bound, the delegate will assume it should be
in a secure state.

Bug: 17464800
Change-Id: I91650d1e3e3ea993168855bc3444b905aac9aac3
 2014-09-26 12:53:29 -04:00
Selim Cinek
7e3bfca8d0 Merge "Fixed a crash with disapearing views" into lmp-dev 2014-09-26 16:50:36 +00:00
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Selim Cinek
40968da1b7 Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 2014-09-26 16:16:36 +00:00
Deepanshu Gupta
743ee98c68 am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NO 
* commit 'f0ebe2fa14e71270e6ea159d3734c1ccc2348030':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:49 +00:00
Deepanshu Gupta
c9b7cb5b9b am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '2dd837cdafd8ce6d2c3db7da20b92a74418f41a6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:43 +00:00
Deepanshu Gupta
23d43a0cc4 am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a7045a43ca83d65134a54236ed0ead7751ee7377':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:38 +00:00
Justin Koh
c483a392ce am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit '1c487938c45317997389b9ad101fc6739e3fe847':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 16:11:33 +00:00
Craig Mautner
66beed58c1 am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '6ae7ea942fc89b1899da267253c5c78596ef5aa1':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 16:11:29 +00:00
Deepanshu Gupta
0a7d7ce140 am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '9fcacf52d0277b0c0485638637ea357721f8c635':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:25 +00:00
Deepanshu Gupta
71c8349ba8 am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ac892f688f206eab746fac1bbe85c9f76657f8d6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:19 +00:00
Raph Levien
b1fef1114e Defer spelling correction with apostrophe 
When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.

Bug: 17641350

Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
 2014-09-26 08:59:28 -07:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
Selim Cinek
f4d7fc3687 Fixed a crash with disapearing views 
Bug: 17660994
Change-Id: Id957bc65f0787860019c491559c4bca242ea620e
 2014-09-26 17:15:34 +02:00
Philip Nowell
31a141af13 Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 2014-09-26 15:00:22 +00:00
Selim Cinek
34cf5c4bfc Increased the falsing threshold when woken up by touch 
Bug: 17649103
Change-Id: Iea4736a761a1108e7832aa62cc2060ea0bd89376
 2014-09-26 16:31:57 +02:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Deepanshu Gupta
f0ebe2fa14 am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:15:55 +00:00
Deepanshu Gupta
f202365ecc am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8c61344d89ab3b1f02228b3da10c8377c41960ff':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:05:03 +00:00