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

179485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hudson
40a0709a56 Merge "Merge frameworks/base changes from master-skia to master." 2015-01-07 16:13:42 +00:00
Jorim Jaggi
4af69ea0cf Merge "Remove dead code #8: Remove old keyguard "bouncer"" 2015-01-07 16:10:27 +00:00
Jorim Jaggi
26118d5260 Merge "Remove dead code #7: Remove unused SysUI resources" 2015-01-07 16:09:44 +00:00
Jorim Jaggi
e020360350 Merge "Remove dead code #6: Delete old recents implementation" 2015-01-07 16:09:05 +00:00
Jorim Jaggi
c892238496 Merge "Remove dead code #5: Remove KeyguardAccountView" 2015-01-07 16:08:26 +00:00
Ben Murdoch
5c6f043d4e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-07 16:06:41 +00:00
Ben Murdoch
bc20686f92 am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:06:33 +00:00
Jorim Jaggi
0603209463 Merge "Remove dead code #4: Remove unused Keyguard strings" 2015-01-07 16:06:30 +00:00
Jorim Jaggi
359fc655ce Merge "Remove dead code #3: Remove unused Keyguard drawables" 2015-01-07 16:04:59 +00:00
Jorim Jaggi
d1a9feb322 Merge "Remove dead code #2: Remove unused Keyguard resources" 2015-01-07 16:04:41 +00:00
Jorim Jaggi
7b5eb5ca04 Merge "Remove dead code #1: Remove unused Keyguard classes" 2015-01-07 16:04:23 +00:00
Ben Murdoch
6a3e70159c am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:01:27 +00:00
Ben Murdoch
d4bc95770d am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 15:55:12 +00:00
Ben Murdoch
1eee52b1aa Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 2015-01-07 15:50:52 +00:00
Geoff Mendal
3f0545a7dc am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE 
automerge: 4e46775  -s ours

* commit '4e46775ceb609220169ec8ff9c6a1310d3fd7c34':
  Import translations. DO NOT MERGE
 2015-01-07 15:39:30 +00:00
Geoff Mendal
4e46775ceb am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE 
* commit 'd79d0310b1eb6e250b3009653ac0490f35fd95bd':
  Import translations. DO NOT MERGE
 2015-01-07 15:37:27 +00:00
Geoff Mendal
d79d0310b1 am 585a210d: (-s ours) Import translations. DO NOT MERGE 
* commit '585a210ddb09d41c5ee4347e991c4fc51e2dbebe':
  Import translations. DO NOT MERGE
 2015-01-07 15:32:10 +00:00
Geoff Mendal
585a210ddb Import translations. DO NOT MERGE 
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
 2015-01-07 07:24:21 -08:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation. 
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
 2015-01-07 15:13:48 +00:00
Geoff Mendal
719d5b3df0 Import translations. DO NOT MERGE 
Change-Id: Idcfd4c630d636eeaaafd95085223178e395d0584
Auto-generated-cl: translation import
 2015-01-07 06:38:31 -08:00
Jorim Jaggi
6b88cdfba7 Remove dead code #8: Remove old keyguard "bouncer" 
Also squashes KeyguardViewBase and KeyguardSimpleHostView into
KeyguardHostView, uses a constant for the user activity timeout
(custom value no longer used).

Change-Id: I919b7d3de1dd1590b20e0f14f0e193ee2b3dc21e
 2015-01-07 15:20:37 +01:00
Jorim Jaggi
a9ef7929b8 Remove dead code #7: Remove unused SysUI resources 
Change-Id: I6e338dee76063d7d200967bef0ed1122c2769d42
 2015-01-07 15:20:28 +01:00
Jorim Jaggi
d61f2271c4 Remove dead code #6: Delete old recents implementation 
Change-Id: I93b1257563d6352a54141bd4c90d2d4587782fd2
 2015-01-07 15:20:13 +01:00
Jorim Jaggi
cd3b5b52ac Remove dead code #5: Remove KeyguardAccountView 
Change-Id: I04431625e922e9554ce55b852bd8ee571049339b
 2015-01-07 15:01:00 +01:00
Jorim Jaggi
8a8941aa1b Remove dead code #4: Remove unused Keyguard strings 
And also remove an unused class.

Change-Id: I50a8a21d99a85cf0d3c301e7b54f434679e1be26
 2015-01-07 15:00:41 +01:00
Jorim Jaggi
4726247b97 Remove dead code #3: Remove unused Keyguard drawables 
Change-Id: Ie11f0834bf55ae979bff78f249221afd553bfd8b
 2015-01-07 15:00:26 +01:00
Jorim Jaggi
a29e81bc7f Remove dead code #2: Remove unused Keyguard resources 
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
 2015-01-07 15:00:16 +01:00
Jorim Jaggi
5c60b64704 Remove dead code #1: Remove unused Keyguard classes 
Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f
 2015-01-07 15:00:04 +01:00
Robin Lee
8e99586830 am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:43:41 +00:00
Robin Lee
23bb3f11cb am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:41:44 +00:00
Robin Lee
26e2da8ff8 am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '374c358dd201583771b7aa391c56618548f543a6':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:36:11 +00:00
Robin Lee
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +00:00
Vladimir Marko
2e61c04070 am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
automerge: 4e29869

* commit '4e2986940b2ff456693a805026c6910e950c42e2':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:32:50 +00:00
Vladimir Marko
4e2986940b am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
* commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:30:44 +00:00
Deepanshu Gupta
b5af276e5e am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
  Fix tests on jenkins
 2015-01-07 10:25:58 +00:00
Quddus Chong
8b0250b820 am 2c9d203c: am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '2c9d203c4a167344bcac8dabf31eae27489214b0':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 10:25:53 +00:00
Quddus Chong
d3d707ed92 am 585be9c0: am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '585be9c01455a44f467c11aaf0150b4e7393ee59':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 10:25:48 +00:00
Vladimir Marko
bf31cb6be4 am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:24:43 +00:00
Quddus Chong
50a0796e69 am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
automerge: 159b409

* commit '159b409121096e28d8735074122c5858b6ed1093':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 10:24:15 +00:00
Joe Fernandez
de60e6d00a am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
automerge: 87df2ea

* commit '87df2ea08fbb9360910c006ca920c43e5165b604':
  docs: studio index typo
 2015-01-07 10:22:55 +00:00
Joe Fernandez
3f4242b89a am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
automerge: dbe3aba

* commit 'dbe3aba4a54bca629b727d81906516a22eee3c5c':
  docs: studio bundle checksum update
 2015-01-07 10:21:24 +00:00
Vladimir Marko
8371f2e3fa Merge "Check for OOM in BitmapFactory's getMimeTypeString()." 2015-01-07 10:20:50 +00:00
Joe Fernandez
597da2488a am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
automerge: b1c7f02

* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
  docs: Checklist for TV Apps
 2015-01-07 10:19:59 +00:00
Deepanshu Gupta
2458f2b12b am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
  Fix tests on jenkins
 2015-01-07 10:17:51 +00:00
Quddus Chong
2c9d203c4a am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit 'dc1db5bf5413bc432c77910d11c15b0442b27ace':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 10:17:45 +00:00
Quddus Chong
585be9c014 am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '0178c0d782fb19cc6235ef6722251a441734345e':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 10:17:39 +00:00
Quddus Chong
159b409121 am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit '1f03d4ba753c9c75a430703e535f4c0cd9daef67':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 10:17:33 +00:00
Joe Fernandez
87df2ea08f am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
  docs: studio index typo
 2015-01-07 10:17:26 +00:00
Joe Fernandez
dbe3aba4a5 am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'ea765e7d803bd85c81c87611f76c4f176045c0f1':
  docs: studio bundle checksum update
 2015-01-07 10:17:20 +00:00
Joe Fernandez
b1c7f0215b am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
  docs: Checklist for TV Apps
 2015-01-07 10:17:13 +00:00