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

10900 Commits

Author SHA1 Message Date
Alan Viverette
cf7f3b6be2 am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
automerge: 0aaebd4

* commit '0aaebd47cc94461aa2c0c87405f2a8ba809ef6c1':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 18:18:07 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Tim Kilbourn
06acead5a2 am 215779b2: am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '215779b2262a6fd0ebeb93a369ad148223984f30':
  Add tv product variants to strings.
 2014-11-11 06:42:51 +00:00
Tim Kilbourn
215779b226 am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.
 2014-11-11 06:37:52 +00:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Alan Viverette
f89b58ca83 Fix Material styling in remaining dialogs and layouts 
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
 2014-11-10 16:14:27 -08:00
Evan Charlton
13cf9cf1d3 am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f 
* commit '3caf6fc7df2e4240ae26026d4e1e9c3a23432975':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 22:35:46 +00:00
Evan Charlton
3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 
automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 20:29:27 +00:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.* 
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
 2014-11-10 11:52:31 -08:00
Tim Kilbourn
8299d02927 Add tv product variants to strings. 
Bug: 18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
 2014-11-10 10:45:13 -08:00
Geoff Mendal
9133cc0cac Import translations. DO NOT MERGE 
Change-Id: I412d51aa749f1a8a5264f9f9ee04c3e1f14c3849
Auto-generated-cl: translation import
 2014-11-10 06:56:28 -08:00
Geoff Mendal
d453184829 Import translations. DO NOT MERGE 
Change-Id: Ic5d0f862954931ce2134834256fcddda9d033ebc
Auto-generated-cl: translation import
 2014-11-10 06:48:15 -08:00
Alan Viverette
e37c761e5e am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'c30a7623a2f97ce791ed019d7014b842f9c9b7d2':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:20:09 +00:00
Alan Viverette
c30a7623a2 am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit '48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:14:45 +00:00
Alan Viverette
48c8cd06aa Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 2014-11-07 22:09:44 +00:00
Jason Monk
aac9f433ff am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '68d0089c66b67b2df2b4c3d9f9e68bbcae637d79':
  Material design for screen pinning cling
 2014-11-07 19:12:03 +00:00
Jason Monk
68d0089c66 am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '975590f22916e184204678758bb339c1d2b6b57f':
  Material design for screen pinning cling
 2014-11-07 19:05:50 +00:00
Jason Monk
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +00:00
Jason Monk
18f99d9134 Material design for screen pinning cling 
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar.  In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.

Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
 2014-11-07 11:09:19 -05:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
c805d3599b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:45:39 +00:00
Baligh Uddin
d3531b9880 Import translations. DO NOT MERGE 
Change-Id: I353eea105f85b0d45a2dd0f45b84921462c87c89
Auto-generated-cl: translation import
 2014-11-06 23:19:45 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
513aa79290 am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '3ed9f2f903a8e6c38ca9f2ce3819ac063281a020':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:33:28 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Amit Mahajan
b34892e1a0 am b0abe26d: am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'b0abe26dd98e005f25afeacc55723bd8e508b703':
  Add configuration to control converting sms destination number
 2014-11-07 00:31:22 +00:00
Amit Mahajan
b0abe26dd9 am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'fc3f2380c97b0e2704b6350e031c96e0b01a3046':
  Add configuration to control converting sms destination number
 2014-11-07 00:24:27 +00:00
Amit Mahajan
fc3f2380c9 Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 2014-11-07 00:17:43 +00:00
Vinod Krishnan
df7ba46332 am c6c5c7d6: am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'c6c5c7d6db61fac9eb3c4637a6d9573a18e43f67':
  Adding wallpaper animations
 2014-11-07 00:06:36 +00:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Alan Viverette
d6570d11e4 Support theme attributes in StateListDrawable <item> element 
Also adds support for specifying drawable as a color since getDrawable()
automatically wraps colors to ColorDrawable. Does not currently allow
themed item elements to be used in Zygote preload, but we can add that
at some point in the future.

BUG: 18208662
Change-Id: I4c9721ffd100da4b9db7743a46c914828b943dae
 2014-11-06 13:50:22 -08:00
Vinod Krishnan
c6c5c7d6db am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'efec89f2edd09c021e4e52f9aa37b6a6ca6f31b8':
  Adding wallpaper animations
 2014-11-06 20:41:35 +00:00
Vinod Krishnan
efec89f2ed am 1d6d4272: Adding wallpaper animations 
* commit '1d6d427278d22d08ef60e5d76162b823e8ad58ed':
  Adding wallpaper animations
 2014-11-06 20:34:58 +00:00
Vinod Krishnan
1d6d427278 Adding wallpaper animations 
- this has the best behavior. Sometimes the behavior is not consistent

Bug: 18058382

Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
 2014-11-06 09:43:49 -08:00
Adrian Roos
34c45bb953 am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit 'b2a6c7b83f894922663e7144048264af96239a1e':
  Round charging indication to nearest minute
 2014-11-06 16:31:43 +00:00
Adrian Roos
b2a6c7b83f am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit '418f4ed077ee0559e7f61b8ea10d53e9784fd631':
  Round charging indication to nearest minute
 2014-11-06 16:26:12 +00:00
Adrian Roos
418f4ed077 Merge "Round charging indication to nearest minute" into lmp-mr1-dev 2014-11-06 16:22:06 +00:00
John Spurlock
f5c825d12d am f97f8304: am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'f97f83046745bfc988f2fc5b6549e7c93ffd35c9':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 22:01:24 +00:00
John Spurlock
f97f830467 am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'cdb72e2392e76da341496d073c601d04b030c990':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:55:40 +00:00
John Spurlock
cdb72e2392 am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'c2a0d9e54e778338d73c99598dc741eebd58a326':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:47:32 +00:00
Jeff Davidson
fb68a97620 am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'dd40ccf36203c740aea3849f54495d1287d02b2b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:43:10 +00:00
John Spurlock
c2a0d9e54e am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '66c46c4a9289a8e21c8f36fe06679be5f6534841':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:40:46 +00:00
Jeff Davidson
dd40ccf362 am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'b42bdef51c5a4de44333ad268f25df1aac5ab880':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:37:34 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
John Spurlock
3a9321d407 Docs: Fix typo in Preference android:order attribute. 
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
 2014-11-05 21:20:36 +00:00
Sanket Padawe
4f1e56143d am 4960a5bb: Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev automerge: d12b695 
* commit '4960a5bb0c93aa49c4303e6e9d30139a4a2e9620':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:44:23 +00:00
Sanket Padawe
4960a5bb0c Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 
automerge: d12b695

* commit 'd12b69518daabff3c13482f4b5140020b747b71f':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:33:37 +00:00
Sanket Padawe
d12b69518d Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 2014-11-05 20:30:30 +00:00