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

143120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
4fc8c66cd4 Import translations. DO NOT MERGE 
Change-Id: I7b6175e9d105f252fd57427b2c15ec31905e6184
Auto-generated-cl: translation import
 2014-07-19 21:41:31 +00:00
Evan Charlton
222db525ed Add a notion of the subscription number 
Expose the actual subscription number so that it can be exposed when
necessary (such as during emergency calls, when it doesn't match the
line 1 number).

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3
 2014-07-19 21:22:31 +00:00
Santos Cordon
23d849569d Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 2014-07-17 19:20:15 +00:00
Santos Cordon
2f42b11d40 InCallService to inherit directly from Service. (1/2) 
Bug: 16416927
Change-Id: I31584556c79e49132c628a0f8f25c372eb4e9b3c
 2014-07-19 13:21:35 -07:00
Adam Powell
6b067c3402 Merge "Measure Toolbar titles last" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
b606a3a312 Measure Toolbar titles last 
Give the maximum amount of room to "real" content views before taking
up space for the title and subtitle of a toolbar.

Bug 16039951

Change-Id: I10da9cdc39e84e6fb3975ee40958c57031002dd5
 2014-07-19 13:26:16 -07:00
Adam Powell
c80f952285 Fix Toolbar title layout in RTL mode 
Welp, that one was embarrassing.

Bug 16192193

Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
 2014-07-19 13:05:26 -07:00
Adam Powell
fba286a056 Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
eb97f473fc Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand 
When Toolbar is acting in the role of an action bar it needs to handle
the case where app code calls setLayoutParams on a custom view with an
ActionBar.LayoutParams instance. Run the newly set LayoutParams
through the check/generate routine normally performed when adding a
child view whenever LayoutParams are set on an existing child to
correct for it.

This might not be a bad thing to generalize someday but it would make
for very confusing compatibility behavior when running code that
was written to expect it on older platform versions.

Bug 16219488

Change-Id: I568a335fe8ebbbaa666690d1f0e95f313abd2f1e
 2014-07-19 11:57:21 -07:00
Adam Powell
00abaa7407 Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 2014-07-17 21:09:48 +00:00
John Spurlock
7b41467704 Zen mode filtering should use new usage constants. 
Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
 2014-07-19 11:57:51 -04:00
Adam Powell
1cd8ce1fb6 Remove obsolete (and large) overscroll drawables 
Bug 16406278

Change-Id: Ic1dd645ce14338f45cd4d62cd89cd02469b983d3
 2014-07-18 18:14:57 -07:00
Yohei Yukawa
ad8f1673f6 Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 2014-07-17 21:15:46 +00:00
Yohei Yukawa
ff328ae743 Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView 
This CL adds an initial support of
CursorAnchorInfoRequest#FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE for
TextView.

This implementation is not highly optimized yet, but it just
works as it should.

BUG: 16379288
Change-Id: Iecb32b4c4dcd7db14d8b2a0d929e1d64e161bc58
 2014-07-19 12:59:52 +09:00
John Reck
c01bd1167a Return Animator instead of ValueAnimator 
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
 2014-07-19 02:00:15 +00:00
Fabrice Di Meglio
6eed108eeb Revert "Fix LocalePicker background" 
This reverts commit 6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.

Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
 2014-07-19 01:58:09 +00:00
Wei Wang
685c175890 More API modification of BLE APIs (1/2). 
Changed include:

1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.

Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
 2014-07-18 18:31:00 -07:00
Wonsik Kim
6b11ea1ab1 Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 2014-07-17 21:07:39 +00:00
Dongwon Kang
1034df8c63 TIF: Reorder TvInputInfo types from old to new. 
This change is internal cleanup change. The purpose of this change is
to reorder the types so that new types can be added at the end of the
type list later.

Change-Id: I377c98dc397ef75c3473ee5133b2ffb49d278a50
 2014-07-19 18:48:32 +09:00
Wonsik Kim
6e0b960f43 Merge "TIF: misc fix for TvInputHal" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
610ccd9117 TIF: misc fix for TvInputHal 
- Fixed synchronization issues
- Add a few debugging logs
- Removed unused types from TvInputHal.

Change-Id: Ia5eb8a496cc3e98cb2c2ed0f77a6a313d33bf6c9
 2014-07-19 19:01:00 +09:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features 
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
 2014-07-19 02:14:00 -07:00
John Spurlock
a63b497f11 Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
6a6641cc4f getMasterStreamType from MUSIC -> NOTIFICATION 
For non-voice-capable devices to follow suit with the new policy.

Bug:15592574
Change-Id: I5de36de5cfe157702bbdf6918df51a98f3f0051a
 2014-07-19 16:21:17 -04:00
John Spurlock
335eff4c40 Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
eb1d88ddf9 Non-voice-capable device default stream is now NOTIFICATION. 
Policy change, the volume rocker displayed when nothing else
is going on is now consistent with voice-capable devices.

Bug:15592574
Change-Id: I0f5cb3667b76e1d05286937c702e532f6298ec7c
 2014-07-19 14:55:42 -04:00
Jean-Michel Trivi
3d63a9c7cd Merge "Add AudioAttributes to stream type conversion" into lmp-dev 2014-07-17 17:59:02 +00:00
Jean-Michel Trivi
09818c1550 Add AudioAttributes to stream type conversion 
Framework internal conversion for going from an AudioAttributes
 instance to a legacy stream type.

Change-Id: Ic3b7d2cf4aa0ac5255aa5897a25c78c940af9f77
 2014-07-18 17:55:00 -07:00
Ricardo Cervera
cbaecd0f35 am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '9c36b83519804000a3d83e141c3ce7455828b4db':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:18:09 +00:00
Robert Ly
860a6ce6d1 am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ee65b63d257f2318c10b7d5bd6797a54ca65a4cd':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:18:00 +00:00
Prashant Malani
84318e52db am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '162d9433502c05c544ddb10d38f9c4b129a82352':
  Make the booting flag update unconditional
 2014-07-18 23:17:52 +00:00
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Quddus Chong
6120c4c949 am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '9fc983f56af76d1abcbf95e6b3b35e506aa2fddd':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-19 00:42:07 +00:00
Deepanshu Gupta
49847bbeeb am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT ME 
* commit '296459ffbb9600a14be24c2cc06284ac47ea84c4':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:59 +00:00
Deepanshu Gupta
cd92f6a730 am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d6322a527c81fa261642582a508f39a617a206a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:52 +00:00
Deepanshu Gupta
580c3d823b am 90824671: (-s ours) am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '90824671b6467919e7aa12a09a6c21797764bca3':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:48 +00:00
Deepanshu Gupta
96c280aa1d am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '4ff3c7f0072d1c56d241b234e7f208009c86112f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:43 +00:00
Deepanshu Gupta
1386fc647b am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '276ae4eee5450674fbc7e27f638f18ddc748b7f6':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:39 +00:00
Deepanshu Gupta
0dfccbc911 am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '0804e0aded17c1aee8cbd2c34247b390051123c3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:35 +00:00
Deepanshu Gupta
e4e37ed5cc am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'd7f2bf067fce644ed902122fffb9e22b6596a0ff':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:31 +00:00
Guang Zhu
7d41c138d2 am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'f59ce46880ebe2c2466a2c862ec2ed401f635d51':
  add command to enable bt snoop log
 2014-07-19 00:33:58 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat 
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
 2014-07-18 17:07:04 -07:00
Quddus Chong
9fc983f56a am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:08:59 +00:00
Quddus Chong
f0804df142 am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:04:21 +00:00
Deepanshu Gupta
296459ffbb am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f498991062d86e4cbf1c9880346a7feb8c428912':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:39:22 +00:00
Deepanshu Gupta
f498991062 am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'd32dd2948d95a01e6b581ffbc357cf759bae0242':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:35:37 +00:00
Deepanshu Gupta
d32dd2948d am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:31:17 +00:00
Deepanshu Gupta
b86675f14b am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:26:45 +00:00
Deepanshu Gupta
f2c5a9ee49 am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b9efa1e5a11d1542d0bab9c945ce1e920b819764':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:22:24 +00:00
Deepanshu Gupta
5d6322a527 am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'ad3ccc741b867c4344e4c6c2338e02052244ae60':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:17:36 +00:00