Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,501 Commits 3 Branches 0 Tags
8953c119fd81a20c56bf0ee30a6830dfbae9649b
Commit Graph

167501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
8953c119fd am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71 
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
  Disable LockPatternUtilsCache
 2014-11-10 22:04:27 +00:00
Jorim Jaggi
050ea8569a am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4 
* commit '105ff0731075f9dab8bc6c7cb47bc5250abab1e2':
  Fix Keyguard affordances for RTL
 2014-11-10 22:04:22 +00:00
Alan Viverette
e4404938c2 am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068 
* commit '5ec0f1c9deb37c2eca4d717e2076e5982bbef99b':
  Clean up encapsulation in date picker classes
 2014-11-10 22:04:15 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Adrian Roos
4dfc666cd2 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 
automerge: a0ecc71

* commit 'a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f':
  Disable LockPatternUtilsCache
 2014-11-10 19:06:54 +00:00
Jorim Jaggi
105ff07310 Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 
automerge: f4a15d4

* commit 'f4a15d438acad20cc46fa2fbec0aa1e5cf85b4ff':
  Fix Keyguard affordances for RTL
 2014-11-10 19:05:37 +00:00
Alan Viverette
5ec0f1c9de Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 
automerge: c0bf068

* commit 'c0bf068bbff3080b930c9bb50bd6cc935b135536':
  Clean up encapsulation in date picker classes
 2014-11-10 19:04:39 +00:00
Adrian Roos
a0ecc714c3 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 2014-11-10 18:35:59 +00:00
Jorim Jaggi
f4a15d438a Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 2014-11-10 18:31:55 +00:00
Jorim Jaggi
0a81822272 Fix Keyguard affordances for RTL 
Bug: 17328362
Change-Id: Ic7d7a5a0d721390064493cf753348b89b7bac7e1
 2014-11-10 19:31:22 +01:00
Alan Viverette
c0bf068bbf Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 2014-11-10 18:29:29 +00:00
Adrian Roos
450ce9fc8a Disable LockPatternUtilsCache 
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
 2014-11-10 19:16:41 +01:00
Dan Sandler
eba923ccce am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '04a1557c497d2ef0ab4011136b0945b20f291bb1':
  Fix inset hinting when adding window
 2014-11-10 18:13:35 +00:00
Dan Sandler
04a1557c49 Merge "Fix inset hinting when adding window" into lmp-mr1-dev 2014-11-10 18:10:36 +00:00
Andres Morales
089792aef9 am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev 
* commit '3a8684117db531f3d56743ffa5a9c8ab7ccd0afd':
  Fix build
 2014-11-10 17:41:40 +00:00
Geoff Mendal
ccfbd1bacc am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '20083734d92eb893c36278d2486404eedc0cc1f9':
  Import translations. DO NOT MERGE
 2014-11-10 17:37:02 +00:00
Paul Jensen
f805988770 am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit '78a853d17a33958ebc7d014cc6ec3998696302d3':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:36:56 +00:00
Andres Morales
3a8684117d am 2885c6ba: Merge "Fix build" into lmp-mr1-dev 
* commit '2885c6ba63850d5fd061460683de768617ed6b31':
  Fix build
 2014-11-10 17:35:55 +00:00
Alan Viverette
8eb4bf6017 am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '7213a52c42e5dd176b30f01c274f36c63e32718e':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:32:38 +00:00
Andres Morales
2885c6ba63 Merge "Fix build" into lmp-mr1-dev 2014-11-10 17:31:27 +00:00
Geoff Mendal
20083734d9 am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43':
  Import translations. DO NOT MERGE
 2014-11-10 17:31:24 +00:00
Paul Jensen
78a853d17a am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit 'cb32559a1ecc476a4502928b0c4e37cd0f7b836c':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:31:19 +00:00
Geoff Mendal
8f02ec4fce am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd53436a9d96100883e55e09ca3e0d5b6eae4fc35':
  Import translations. DO NOT MERGE
 2014-11-10 17:27:42 +00:00
Paul Jensen
cb32559a1e Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 2014-11-10 17:27:12 +00:00
Andres Morales
0d8537ae7f Fix build 
Forgot to run make update-api in
https://googleplex-android-review.git.corp.google.com/#/c/582630/

Change-Id: I3c4dd253d0f1ffea8ae1b72835aee91541ed7d6f
 2014-11-10 09:26:18 -08:00
Alan Viverette
7213a52c42 am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '82aaf332b62c5a276c4046d1339441d68d817371':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:24:38 +00:00
Geoff Mendal
d53436a9d9 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-10 17:23:38 +00:00
Alan Viverette
82aaf332b6 Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 2014-11-10 17:18:49 +00:00
Geoff Mendal
5b114e85ea am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4':
  Import translations. DO NOT MERGE
 2014-11-10 17:17:38 +00:00
Geoff Mendal
deb466201a am c0c9b129: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c0c9b129440122b05a7245b6b624e83e9be2f93d':
  Import translations. DO NOT MERGE
 2014-11-10 17:17:33 +00:00
Geoff Mendal
30a7f56cfb am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '7d447f734d334dfdd953fdcd45b38fabbeec58dc':
  Import translations. DO NOT MERGE
 2014-11-10 17:16:01 +00:00
Geoff Mendal
c0c9b12944 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-10 17:14:59 +00:00
Geoff Mendal
fa62b15266 Import translations. DO NOT MERGE 
Change-Id: I9f1f78c7b1589471c3a4f315d53923db92378b37
Auto-generated-cl: translation import
 2014-11-10 09:13:39 -08:00
Geoff Mendal
7d447f734d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-10 17:12:22 +00:00
Geoff Mendal
0b3daeb059 Import translations. DO NOT MERGE 
Change-Id: I174285e3b8e29495ea7128c91297450d9232b674
Auto-generated-cl: translation import
 2014-11-10 09:10:56 -08:00
Geoff Mendal
1532657866 Import translations. DO NOT MERGE 
Change-Id: I25189cd7ce81d2f1039f0121c6deaa0947bf6ec8
Auto-generated-cl: translation import
 2014-11-10 09:07:55 -08:00
Ricardo Cervera
c4d9097b4a am 15da5f95: am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit '15da5f959d59dd91c12e52dbf648ea6df2695eb1':
  docs: Material design shadow fixes.
 2014-11-10 17:03:07 +00:00
Andres Morales
9e19c118a1 am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
  Unhide DISALLOW_OUTGOING_BEAM
 2014-11-10 16:58:53 +00:00
Ricardo Cervera
15da5f959d am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit '1e01a9f787738685c86342ced6c0e49fa2569699':
  docs: Material design shadow fixes.
 2014-11-10 16:57:43 +00:00
Elliott Hughes
93cdf1041e am 5cce4c75: Merge "Fix memory leak where we close the descriptor instead of the file." 
* commit '5cce4c752eeeaed74f815b9154ec7f4f3f2397ec':
  Fix memory leak where we close the descriptor instead of the file.
 2014-11-10 16:55:44 +00:00
Andres Morales
9467926bd1 am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 
* commit 'cc8d56f66c64a66002b90ed014bbd2fb46125f63':
  Unhide DISALLOW_OUTGOING_BEAM
 2014-11-10 16:53:18 +00:00
Ricardo Cervera
1e01a9f787 am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit 'abf58f9865e21f95356f2c32c4e2029d38a3a6a4':
  docs: Material design shadow fixes.
 2014-11-10 16:51:51 +00:00
Andres Morales
cc8d56f66c Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 2014-11-10 16:48:45 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window 
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
 2014-11-10 17:46:57 +01:00
Ricardo Cervera
abf58f9865 am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit '43f46ab99de710f9b39106e1ac4733f06188e74c':
  docs: Material design shadow fixes.
 2014-11-10 16:46:47 +00:00
Elliott Hughes
5cce4c752e Merge "Fix memory leak where we close the descriptor instead of the file." 2014-11-10 16:46:44 +00:00
Pete Gast
2ad988aa6e am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '642b4d93b9ce73866d7985172d31661a55aed7be':
  Expand WearableExtender to customize labels.
 2014-11-10 16:45:02 +00:00
Derek Sollenberger
c793fcb026 Fix memory leak where we close the descriptor instead of the file. 
(cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.)

bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
 2014-11-10 08:44:46 -08:00
Ricardo Cervera
43f46ab99d am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit 'e627b94c76ad144abb0207efcdc6b1cb3855bc14':
  docs: Material design shadow fixes.
 2014-11-10 16:42:20 +00:00
Pete Gast
642b4d93b9 am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '705c9c131a6df977a2e9430cacb84788ef0cecbf':
  Expand WearableExtender to customize labels.
 2014-11-10 16:40:33 +00:00