Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,931 Commits 3 Branches 0 Tags
d7faa95f4e8be9dffd0d7cb764f1b659c19ecaf4
Commit Graph

45030 Commits

Author SHA1 Message Date
Igor Murashkin
381d22f706 Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 2014-09-26 22:20:12 +00:00
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
Fabrice Di Meglio
a552e9846a am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:01:47 +00:00
Fabrice Di Meglio
c410968871 am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 20:56:54 +00: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
Dianne Hackborn
5e2285527d am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '298b3d23d22e9a503eee856fe318b44536737e3b':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:11:52 +00:00
Dianne Hackborn
f051b703db am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:07:46 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Martijn Coenen
e20f9aa316 am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:53:03 +00:00
Jorim Jaggi
b56ec7fc26 am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
  Don't preload task description icons when opening recents
 2014-09-26 19:52:56 +00:00
Raph Levien
a4e3a616cd am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit '02366924dfd8c0ae2c61f87a92c0b6a24a852f29':
  Defer spelling correction with apostrophe
 2014-09-26 19:52:48 +00:00
Martijn Coenen
a751e2aa37 am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:43:03 +00:00
Jorim Jaggi
875db8db40 am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
 2014-09-26 19:42:55 +00:00
Raph Levien
e430e9bba6 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:42:46 +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
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +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
Raph Levien
c8ffeeca67 Merge "Defer spelling correction with apostrophe" into lmp-dev 2014-09-26 17:12:49 +00: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
Philip Nowell
6575738251 am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit 'f8ecaacbfd77cdb0b2aa1fb0918243691415c86e':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 16:06:57 +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
Philip Nowell
32ab32c85e am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 15:10:46 +00: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
Przemyslaw Szczepaniak
16f5ec1207 am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:31:04 +00:00
Przemyslaw Szczepaniak
d95788bf85 am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Svetoslav
0329423afa am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit 'b14c7e041441376d7e248613d82b46569a8bae62':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 04:42:23 +00:00
Dianne Hackborn
7c1de6c06e am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 04:41:38 +00:00
Alan Viverette
91e18e538a am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 
* commit '5a99c276b329a7c828e65083da5d5df73e60915e':
  Correctly advertise accessibility scrolling actions
 2014-09-26 04:41:34 +00:00
Svetoslav
75d7874edc am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 01:58:29 +00:00
Svetoslav
a8181a9a0b Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 2014-09-26 01:51:54 +00:00
Svetoslav
c569d35945 Using wrong virtual view id When prefetching accessibility nodes. 
When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
 2014-09-25 18:46:33 -07:00
Dianne Hackborn
0f129c7959 am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 01:30:47 +00:00
Alan Viverette
52128ecd61 am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 
* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
  Correctly advertise accessibility scrolling actions
 2014-09-26 01:30:43 +00:00
Dianne Hackborn
a7b1595c25 Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 01:15:02 +00:00
Alan Viverette
80c0bbe82c Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 2014-09-26 01:13:13 +00:00
Martijn Coenen
56a3e67433 Add hidden API to disable NFC (optional persist). 
Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
 2014-09-25 18:02:27 -07:00
Philip Nowell
d561913798 Corrects a typo that identified XXXHIGH as 560 dpi instead of 640. 
Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
 2014-09-26 00:54:32 +00:00
Dianne Hackborn
017c6a28be Work on issue #17656716: Unhandled exception in Window Manager 
Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
 2014-09-25 17:48:44 -07:00
Adam Powell
3f1ead4859 am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit '11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 00:30:50 +00:00
Adam Powell
4967a73816 am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 00:16:26 +00:00
Igor Murashkin
51dcfd65a6 camera2: Fix race conditions and deadlocks around configuration 
Fixes an illegal state exception that sometimes occurs during
configuration. Fixes a deadlock during unconfiguration. Fixes
the idle handler never being run during configuration.

Bug: 17628736
Change-Id: Id2c5e416f96fcbac9c718fca3cc2cf21734bc6a4
 2014-09-25 16:57:18 -07:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity 
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
 2014-09-25 16:54:41 -07:00
Adrian Roos
f2be7170bf am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
  Ensure that setting an empty password clears it
 2014-09-25 22:56:39 +00:00
Eino-Ville Talvala
c043b87d48 am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-25 22:56:36 +00:00
Adrian Roos
dc1fc7fc77 am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it
 2014-09-25 22:47:25 +00:00
Eino-Ville Talvala
3517b1db4a am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-25 22:47:21 +00:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00
Michael Wright
b17ff6777d am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:38:38 +00:00