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

10005 Commits

Author SHA1 Message Date
Vineeta Srivastava
7c90b84ba4 am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'bc067325de8197a38feec3782a64e02023c9170d':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-11 17:51:41 +00:00
Vineeta Srivastava
e14a29ff3d Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 2014-09-11 17:41:02 +00:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call 
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
 2014-09-11 09:49:45 -07:00
ztenghui
987c7e0967 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:44:17 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
Baligh Uddin
ef9517f019 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:31 +00:00
Jorim Jaggi
68a7bd4933 am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit '7a09459352d0f37380d2552b8a90834c4073fa63':
  Fix inconsistent layout param in notification
 2014-09-11 12:47:05 +00:00
Jorim Jaggi
0cf327daf3 Merge "Fix inconsistent layout param in notification" into lmp-dev 2014-09-11 12:40:04 +00:00
Alan Viverette
8dbfafd5fa am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-10 23:33:30 +00:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
ztenghui
2e17d2b232 Bring back the fillAlpha and strokeAlpha. 
At the same time, remove the group alpha since we did not follow the convention
that group's alpha should apply together, not separately to each elements.

b/17393626

Change-Id: Idfc071414213583924961dc8ea760d6fb317873c
 2014-09-10 16:26:48 -07:00
Alan Viverette
362f984df3 Make SearchView styles public, remove public Holo styles added in L 
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.

BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
 2014-09-10 16:05:35 -07:00
vandwalle
abdf298d67 am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev 
* commit '9e444d7a905f4fbfb4e3511380d7e668d9700561':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
 2014-09-10 21:27:06 +00:00
Jorim Jaggi
cfc18c7327 Fix inconsistent layout param in notification 
Might increase the measure performance a bit.

Bug: 17040206
Change-Id: I2fff039cefdb4f21aff2674b6e7449549f5f8670
 2014-09-10 23:04:43 +02:00
vandwalle
e26bc8fda7 make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration 
Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
 2014-09-10 13:49:48 -07:00
Svetoslav
689ae852ea am 0f2e085d: Merge "RTL support for print UI." into lmp-dev 
* commit '0f2e085da75d003a2f3b7490dda9b9ac2aef58ba':
  RTL support for print UI.
 2014-09-10 20:14:36 +00:00
Svetoslav
fc81bfe3fb Merge "RTL support for print UI." into lmp-dev 2014-09-10 20:06:18 +00:00
Jason Monk
e746b503ae am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '473d27fa34875083dfea48e933c2e9300979c64a':
  Move zen mode constants and code to framework
 2014-09-10 15:10:02 +00:00
Jason Monk
c8e4fa41f2 Merge "Move zen mode constants and code to framework" into lmp-dev 2014-09-10 15:00:20 +00:00
John Spurlock
3961ecb0e5 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:45:22 +00:00
Jason Monk
4dd81467e3 Move zen mode constants and code to framework 
This allows the strings and code to be shared with settings.

Bug: 15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
 2014-09-10 09:30:03 -04:00
John Spurlock
bf4e41747d Zen: Make condition providers available via @SystemApi. 
Bug:16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
 2014-09-10 09:13:54 -04:00
Christoph Studer
dbd57a7386 am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit 'c4290acf31f537821c42356d8a5db22afd353d1c':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:22:01 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Svetoslav
3ab1ec0549 RTL support for print UI. 
bug:16966145

Change-Id: I488d11f1941545630d52eea4c4d48c43667c6067
 2014-09-09 21:30:35 -07:00
Alan Viverette
ec2cef46c2 am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev 
* commit 'a9962d3609c2cf03ee7d437fcee2c339423da3c5':
  Improve dialog padding when title or body text are missing
 2014-09-10 01:36:29 +00:00
Alan Viverette
cd7955f66c Merge "Improve dialog padding when title or body text are missing" into lmp-dev 2014-09-10 01:27:57 +00:00
Alan Viverette
e809b11bc1 Improve dialog padding when title or body text are missing 
BUG: 17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
 2014-09-09 18:24:52 -07:00
Amit Mahajan
da3a6a9e2d am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev 
* commit '7cd6fc5b838fde5046028518cee44d8fd69cc701':
  Support to load default voicemail number from the configuration.
 2014-09-10 00:29:11 +00:00
Xia Ying
b9515f9c44 Support to load default voicemail number from the configuration. 
If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.
Define config_default_vm_number for this purpose. And there are two
optional formats for this configuration, example as below:
(1)<item>voicemail number</item>
(2)<item>voicemail number;gid</item>

Bug: 17209959
Change-Id: Ia4e78ad7265e73bb4e4a823dbaeb606935d39f46
 2014-09-10 00:11:23 +00:00
Adam Lesinski
325820e197 am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:56:38 +00:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:50:04 +00:00
Tsuwei Chen
16935e2f3a am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 
* commit '5675ab1b691f2dc2b94bbdd78bbdbba90896cb01':
  Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144
 2014-09-09 23:34:44 +00:00
Tsuwei Chen
98ff7bce66 Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 2014-09-09 23:29:14 +00:00
Tsuwei Chen
67862cf3de Move carrier-specific GPS parameters out of framework/base directory. 
Bug: 17288144

All carrier values has been moved to device only directory, in this change:
https://googleplex-android-review.git.corp.google.com/#/c/543322

Change-Id: Idb958a75edc612dc83c8382fa6546c3588889e39
 2014-09-09 22:27:04 +00:00
vandwalle
1853fddaf4 am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
  make autojoin associated scan period a config opttion
 2014-09-09 22:19:48 +00:00
vandwalle
2bc9f4178a Merge "make autojoin associated scan period a config opttion" into lmp-dev 2014-09-09 22:12:06 +00:00
Alan Viverette
9597427fe9 am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev 
* commit 'ba2ce6fa080df627646501f58bab5fde76b0f2c2':
  Update alert dialog styling to match Material spec
 2014-09-09 21:49:47 +00:00
Alan Viverette
6aad5057b6 Merge "Update alert dialog styling to match Material spec" into lmp-dev 2014-09-09 21:43:33 +00:00
Philip Milne
737d4a12b0 am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes 
* commit '2a95b928c8fbe326d79776fa30d0d18809a0dd45':
  Fix for b/16400888 - API Review: GridLayout attributes
 2014-09-09 21:29:23 +00:00
Philip Milne
1a7a63ad5e Fix for b/16400888 - API Review: GridLayout attributes 
Column weights specify the relative proportions of space distribution 
within a *row*. With that in mind, I flipped the vertical and horizontal 
axes in the docs - but that was a mistake. This CL flips the docs back. 
The code works the right way around so doesn't need to be modified.

Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
(cherry picked from commit 4ae5f5ee917b2014abe3b6e0b99451693cd2b896)
 2014-09-09 21:25:44 +00:00
Adam Lesinski
6590d7c75c Make UsageStats API default on only for the system 
This changes the PACKAGE_USAGE_STATS permission to be
a signature only permission, meaning that only apps
signed with the system signature have access to the
UsageStats API enabled by default.

Bug:17428130
Change-Id: I79ba54d7102c770ea2490f014a1f6736f0f46b3a
 2014-09-09 20:30:33 +00:00
Vineeta Srivastava
d3773b2914 am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit 'a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:09:04 +00:00
Vineeta Srivastava
1f14863871 Merge "Set MTU size to 1410 for Telus." into lmp-dev 2014-09-09 18:02:57 +00:00
Griff Hazen
3eeb09605d am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit 'b0e0f2f6185fc42842ff3fccedcc608c5a8f8d27':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:31:02 +00:00
New Author Steven Liu
82468851b5 Set MTU size to 1410 for Telus. 
Bug: 17391167
Change-Id: I38c0d2a311624db66113b5eda2a5eceb6fec2a69
 2014-09-09 16:44:44 +00:00
Christoph Studer
aca4b25f47 Notification: Use ViewStub for ProgressBar 
Lazily inflate ProgressBars since they're expensive.

Bug: 17366831
Bug: 17399567
Change-Id: I2b85169a67d41a66fead2fccef2381eaa671c3e4
 2014-09-09 15:58:41 +02:00
vandwalle
cbd55abd81 make autojoin associated scan period a config opttion 
Change-Id: Ieb187b255f0f87cb33493d98c23a9f01dab15fc6
 2014-09-09 01:30:55 -07:00
Griff Hazen
7fb6146647 Add support for a circular bitmap overlay for round android wear emulator. 
Android wear emulators have never had support for enabling both gpu
emulation and also having a round clip overlay present. Fix this by
supporting a drawable overlay when the ro.emulator.circular system
property is set.

Bug: 13415409

Change-Id: I6e0840ebe5c77adb786a7ba7ec6af348308ca46a
 2014-09-08 21:34:52 -07:00
Adam Powell
362f4f7f63 am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev 
* commit 'd6fa07e7a598a070ac70ed0bead3b0a070d1b946':
  New new design for ResolverActivity
 2014-09-09 03:02:25 +00:00