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

143209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
627439401e am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:58:42 +00:00
Deepanshu Gupta
7f98066dd1 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 '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:44 +00:00
Deepanshu Gupta
62b81acbca 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 '2df48bed6afed4958835b8bdc2c8b44db32919fc':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:16 +00:00
Deepanshu Gupta
cee55fc19b 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 '99286edc3ef164d0d247a86cc58c391e5854aa70':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:57:01 +00:00
Deepanshu Gupta
8c71ff298b am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '87234e8544370d86b305fc55d6a5021c38b65495':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:55:21 +00:00
Deepanshu Gupta
8613f82628 am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'efd29681d8f8df6d23a1e7f307e9300bd8331a2f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:54:59 +00:00
Deepanshu Gupta
0804e0aded am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'a9e488a6d2b20ecc91412072a5f39022d7fe6926':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:37 +00:00
Deepanshu Gupta
99286edc3e am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'aa0c1c755c15fec30f005d53bed6091180c4e521':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:53:15 +00:00
Deepanshu Gupta
2df48bed6a 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 '1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:11 +00:00
Deepanshu Gupta
4c312f20ca am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:52:52 +00:00
Deepanshu Gupta
efd29681d8 am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
87234e8544 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
aa0c1c755c am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'e83fa180a874fb9222ae8e87c0d333411decc0c7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:49:13 +00:00
Deepanshu Gupta
1bdfeadb61 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 '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:49:11 +00:00
Deepanshu Gupta
a9e488a6d2 am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:48:05 +00:00
Deepanshu Gupta
d7f2bf067f am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:45:47 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:19 +00:00
Deepanshu Gupta
964591a6e1 am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:52 +00:00
Deepanshu Gupta
e83fa180a8 am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:11 +00:00
Deepanshu Gupta
d8d3e87cf3 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:41:18 +00:00
Deepanshu Gupta
f75489f2f1 am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:42 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:33 +00:00
Deepanshu Gupta
85c7b209c3 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
 2014-07-18 03:31:43 +00:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Wonsik Kim
61acf46d6a Merge "TIF: revise API names" into lmp-dev 2014-07-17 21:07:39 +00:00
Sungsoo Lim
9bf671f8ee TIF: revise API names 
- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
 2014-07-19 21:22:16 +09: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
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:34:58 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:31:01 +00:00
Robert Ly
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:30:32 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:27:03 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
 2014-07-17 19:55:32 +00:00
Guang Zhu
b477fc6c2f Merge "add command to enable bt snoop log" into klp-modular-dev 2014-07-17 19:26:18 +00:00