Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
57928195a8 Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 2014-10-30 23:11:53 +00:00
Mark Renouf
ff2e71830c Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
automerge: 7be03da  -s ours

* commit '7be03da0d4365346934c9d6672526119765d1047':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 23:07:22 +00:00
Scott Rowe
b31c2b0714 am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
* commit '397eb67fbf9af409406750ce58a16b64b4a6b1e2':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-10-30 23:06:18 +00:00
Scott Rowe
397eb67fbf Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 2014-10-30 22:55:20 +00:00
Baligh Uddin
e219039d4c Import translations. DO NOT MERGE 
Change-Id: I92a4941b6135daac0a41c6763357bd8f7e1bb702
Auto-generated-cl: translation import
 2014-10-30 15:42:25 -07:00
Baligh Uddin
8ce3a1b676 Import translations. DO NOT MERGE 
Change-Id: I2ec7cc5a65cd0dd9e3d673cf78fdae56afff9b84
Auto-generated-cl: translation import
 2014-10-30 15:40:40 -07:00
Mark Renouf
6497dd7325 am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
* commit 'b5c5a0dc429d1d1944296bb9f1da403126fabcc5':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 22:39:09 +00:00
Alan Viverette
e1f9f23110 am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit '685a8770c018d02080d29f18fcb9e50a182912aa':
  Fix inset check in ThreadedRenderer
 2014-10-30 22:34:44 +00:00
Mark Renouf
b5c5a0dc42 am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
* commit '7be03da0d4365346934c9d6672526119765d1047':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-10-30 22:33:32 +00:00
Baligh Uddin
cce45a2863 Import translations. DO NOT MERGE 
Change-Id: Ib9142933cee63a20d7efa00b372b2685b956c8a4
Auto-generated-cl: translation import
 2014-10-30 15:33:23 -07:00
Alan Viverette
685a8770c0 Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 2014-10-30 22:30:21 +00:00
Mark Renouf
7be03da0d4 Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 2014-10-30 22:27:05 +00:00
Baligh Uddin
eb37dd5b47 Import translations. DO NOT MERGE 
Change-Id: I1f5ec17cae6ffd48fac4f70c4f39337c3e094ff8
Auto-generated-cl: translation import
 2014-10-30 15:22:59 -07:00
Baligh Uddin
a061f683ce Import translations. DO NOT MERGE 
Change-Id: I91b710d25349dbfe01424c39b0dbfa9de6675843
Auto-generated-cl: translation import
 2014-10-30 15:21:21 -07:00
Baligh Uddin
c50cd28f6c Import translations. DO NOT MERGE 
Change-Id: I95e8c4617b42c52efbf878bdefabb0486a489e38
Auto-generated-cl: translation import
 2014-10-30 15:19:47 -07:00
Baligh Uddin
7febe5985c Import translations. DO NOT MERGE 
Change-Id: I95840329225909e062fe2221603ac91004517544
Auto-generated-cl: translation import
 2014-10-30 15:17:39 -07:00
Craig Mautner
3bfd2b7b8f am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '159da3dba8811017c683fcee26c795be1948b0c4':
  Add enter-animation-done callback for system windows
 2014-10-30 22:15:57 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows 
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
 2014-10-30 14:43:18 -07:00
Alex Klyubin
8e93f0c3bc Mention ECDHE_PSK bug in Javadoc of PskKeyManager. 
Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
 2014-10-30 21:39:03 +00:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants. 
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.

Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
 2014-10-30 14:27:48 -07:00
Alan Viverette
d93421b143 am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'afffc5c29adafc6a4c0b33834b2e016be02ee7bd':
  Remove scroll view from correct parent in AlertController
 2014-10-30 21:13:17 +00:00
Alan Viverette
afffc5c29a Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 2014-10-30 21:09:19 +00:00
Mark Renouf
e69bebd5aa Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE 
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
 2014-10-30 21:03:25 +00:00
Guang Zhu
3a68e1811f am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '4ba4e03e6b8dcb556774b323429f8904676cd615':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-30 21:00:34 +00:00
Guang Zhu
4ba4e03e6b Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 2014-10-30 20:56:40 +00:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController 
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
 2014-10-30 13:51:21 -07:00
Scott Rowe
baa862666c Merge "docs: Training refactor for Android Studio Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612" 2014-10-30 20:40:57 +00:00
Baligh Uddin
7b2c26dce9 Import translations. DO NOT MERGE 
Change-Id: I25d2ae8de65186cd9cb3e6447c661a507c2be2df
Auto-generated-cl: translation import
 2014-10-30 13:22:12 -07:00
Baligh Uddin
0aa10d44ed Import translations. DO NOT MERGE 
Change-Id: I1cc5677cc67dff0777c4bd2960d085003d6f98a5
Auto-generated-cl: translation import
 2014-10-30 13:17:29 -07:00
Baligh Uddin
abeca149d7 Import translations. DO NOT MERGE 
Change-Id: I37bac04e94e138a6bea3d16bbbad8926bf3d98bd
Auto-generated-cl: translation import
 2014-10-30 13:15:49 -07:00
Baligh Uddin
8db41fe7b0 Import translations. DO NOT MERGE 
Change-Id: I5d284a5f27834737993c75974cc5b3361a157f4e
Auto-generated-cl: translation import
 2014-10-30 13:12:29 -07:00
Santos Cordon
52e34e6a62 am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 
* commit 'c1c86151b033a2c866c10970553b567dfb359ba9':
  More updates to javadocs for Telecom APIs.
 2014-10-30 20:05:30 +00:00
Santos Cordon
c1c86151b0 Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-30 20:01:40 +00:00
David Friedman
62b532c7f4 am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
* commit 'd2d8c55304438accd9589eaa0cb49fcaae3e54cd':
  Fixes wrongly nested braces. Bug: 17499985
 2014-10-30 20:01:13 +00:00
David Friedman
d2d8c55304 am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
* commit 'e91c37de784babbe879c78c83817b99d54b61d2f':
  Fixes wrongly nested braces. Bug: 17499985
 2014-10-30 19:56:37 +00:00
Scott Rowe
8c068aeee0 docs: Training refactor for Android Studio Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612 
Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06
 2014-10-30 12:32:21 -07:00
George Mount
1fb941dd4f Ensure views are attached prior to starting enter transition. 
Bug 17964119

Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
 2014-10-30 12:30:12 -07:00
Santos Cordon
3ae9505f67 am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev 
* commit '9acb9598b7bd18003ee3abe656818972dad03a29':
  Even more javadocs for telecom.
 2014-10-30 19:29:07 +00:00
Santos Cordon
9acb9598b7 Merge "Even more javadocs for telecom." into lmp-mr1-dev 2014-10-30 19:25:40 +00:00
John Spurlock
251c3840fa am 5612c757: am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev automerge: a410961 
* commit '5612c757df61f8f56064a77b71b57a207be763d3':
  PowerUI: Suppress warning on incremental drops.
 2014-10-30 19:24:42 +00:00
Jason Monk
c199a13162 am 5d06da83: am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev automerge: 736695d 
* commit '5d06da838649033c56dc2dedb77d6cdbd774eb87':
  QS: Only hide grid if there is detail to show
 2014-10-30 19:24:38 +00:00
Kenny Guy
b819e7b714 am a3497841: am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev automerge: 5cf65f7 
* commit 'a349784180f7e64a257e320799432ec12737895c':
  Listen for package changes for all users not just owner.
 2014-10-30 19:24:34 +00:00
Chris Wren
e9b498fb41 am e52d0d68: am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev automerge: b3239da 
* commit 'e52d0d68c4c192340ef48a2c750babfd48c090e3':
  Reveal notification listener settings APIs.
 2014-10-30 19:24:29 +00:00
Alan Viverette
3aa1ffbc75 Fix inset check in ThreadedRenderer 
BUG: 17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
 2014-10-30 12:22:08 -07:00
George Mount
ca5094a05c Fix NPE when snapshot ImageView uses ScaleType.MATRIX. 
Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
 2014-10-30 12:21:00 -07:00
John Spurlock
5612c757df am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev 
automerge: a410961

* commit 'a410961f79d845713ab2722788a40afca51f0eef':
  PowerUI: Suppress warning on incremental drops.
 2014-10-30 19:20:25 +00:00
John Reck
eaab65f49d am 97054254: am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev automerge: a27e1a3 
* commit '97054254d4c8eef66538814e1d5def776ceba97a':
  Be more conservative about current buffer
 2014-10-30 19:20:17 +00:00
Jorim Jaggi
f949f9e96e am ba541fd0: am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev automerge: 358aed4 
* commit 'ba541fd0c2bde5717586e5b0c80f6f0e24e95332':
  Improve doze transitions
 2014-10-30 19:20:13 +00:00
Geoff Mendal
29efa6b5df am c609f4db: (-s ours) am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: ef3d9bc -s ours 
* commit 'c609f4db3f08ef14db1612ac50af5e4e8aa1c580':
  Import translations. DO NOT MERGE
 2014-10-30 19:20:07 +00:00