3677 Commits

Author SHA1 Message Date
Dianne Hackborn
76c71ab419 am e1f19370: am e7b37bc2: am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev
* commit 'e1f19370ff1a64eeda3fd147663d6ac7fe093406':
  Fix build.
2015-08-01 17:04:52 +00:00
Dianne Hackborn
e5d926deb2 Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
2015-07-31 11:17:43 -07:00
Adam Lesinski
a5c9d829ce am 7fa83d26: am b9904daa: am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '7fa83d269b6f84ae32ddc94731a44acb6d66c4c1':
  AAPT: Fix resource versioning
2015-07-31 00:55:20 +00:00
Adam Lesinski
e3b0119f79 Merge "AAPT: Fix resource versioning" into mnc-dev 2015-07-31 00:28:05 +00:00
Deepanshu Gupta
a661adfdf9 am c62b9bdf: am 24578570: am 3991bea8: am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit 'c62b9bdfb9d623db9ca0ded3a57fa3f0e6965300':
  Update status bar time.
  Fix imports.
  Add MockView constructor used by LayoutInflater.
  Poor implementation of Path.approximate()
  Include EpicenterTranslateClipReveal in LayoutLib
  Fix theme namespace in tests.
  LayoutLib: fix layout when nav bar is absent.
  LayoutLib: Fix Status/Navigation Bar color.
2015-07-30 22:28:30 +00:00
Deepanshu Gupta
7676e403bd Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* changes:
  Update status bar time.
  Fix imports.
  Add MockView constructor used by LayoutInflater.
  Poor implementation of Path.approximate()
  Include EpicenterTranslateClipReveal in LayoutLib
  Fix theme namespace in tests.
  LayoutLib: fix layout when nav bar is absent.
  LayoutLib: Fix Status/Navigation Bar color.
2015-07-30 21:58:03 +00:00
Elliott Hughes
0e252720b2 am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."
* commit 'e528f048689868a2d4dfdf23b553fe536acd15cd':
  Move frameworks/base/tools/ off AndroidConfig.h.
2015-07-30 00:16:28 +00:00
Deepanshu Gupta
36e3fa55b6 Update status bar time.
Copy the value from the demo mode (commit 33b60bb45f)

Change-Id: I4c215676e7ae26a68aa370e99db005226d8a05d9
2015-07-29 17:01:33 -07:00
Deepanshu Gupta
671b7f9b99 Fix imports.
Also remove null checks on return value of ReflectionUtils.getMethod()
as the method always return non null.

Change-Id: Ib476302c2cf0504a0f54db4e795955ad10e5df3f
2015-07-29 15:34:48 -07:00
Deepanshu Gupta
9bf4b6f8c0 Add MockView constructor used by LayoutInflater.
Change-Id: I0aede28866c1b87fb66c8a416c5026a9b2cb04fe
2015-07-29 15:34:47 -07:00
Deepanshu Gupta
78aa664b02 Poor implementation of Path.approximate()
Include a very poor implementation of Path.approximate() in LayoutLib
that only returns the first and last coordinate of the path. This avoids
crashing the rendering when certain assumptions are made on the value
returned from the method.

Also change the error to a warning.

Change-Id: I9241dec734d4df90a9eebd1e6de8b3e443eee3c8
2015-07-29 15:34:38 -07:00
Elliott Hughes
9ec96f9756 Move frameworks/base/tools/ off AndroidConfig.h.
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
2015-07-29 14:35:18 -07:00
Deepanshu Gupta
214466c777 Include EpicenterTranslateClipReveal in LayoutLib
Needed by Spinner to create transitions that are then ignored :)

Change-Id: Ibe7167a643ecb186e97c9af446c0e1d2eb2d6f86
2015-07-29 14:30:05 -07:00
Deepanshu Gupta
4a6ee98d39 Fix theme namespace in tests.
The tests used framework theme (Material), but the ResourceResolver was
created with project theme. This caused tests to fail becasue of missing
resources.

Change-Id: Ia17ee19054f6689f85e3423e83c1f47a2cc4364f
2015-07-29 14:27:02 -07:00
Svetoslav Ganov
c875ad14dd am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev
* commit '56de616725aca7d875fafc2a94e00ae9874fedf9':
  Remove dependencies on the package installer's package name
2015-07-29 19:23:52 +00:00
Elliott Hughes
bda2b34bfa am a7e6be68: am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
* commit 'a7e6be686d38e80cbb385f643eb5c790a7094f34':
  Use _WIN32 rather than HAVE_WINDOWS_PATHS.
2015-07-29 16:46:20 +00:00
Elliott Hughes
98c11b511a Use _WIN32 rather than HAVE_WINDOWS_PATHS.
Change-Id: Ib1ae71dfbb20e3e5309ed737f48382cc42d2583f
2015-07-29 08:44:17 -07:00
Svet Ganov
f1b7f20bb8 Remove dependencies on the package installer's package name
bug:22700053

Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
2015-07-29 08:33:46 -07:00
Deepanshu Gupta
6e8d8ad2b7 LayoutLib: fix layout when nav bar is absent.
Change-Id: I0d3ee6fd5a4656156a630d3b298533ea13eb8415
2015-07-28 18:30:48 -07:00
Adam Lesinski
f45d2fad2e AAPT: Fix resource versioning
Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource
with v1, and a different attribute with sdk level 21 was used in a resource with v11,
a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11.

This change fixes the issue, having the higher versioned resource take precedence.

Bug:22793816
Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9
2015-07-28 12:26:57 -07:00
Deepanshu Gupta
e3f9834ebd LayoutLib: Fix Status/Navigation Bar color.
If the color value for status bar or navigation bar is declared directly
in the theme (i.e. doesn't reference a color resource via @color/foo),
the ResourceType for the attribute is not assigned by the IDE. LayoutLib
used to ignore resources that were not of type color. This change fixes
the issue by also checking the resources without a type.

Change-Id: I94735ec225415282db06ab9db5c3233ad89c052f
2015-07-27 11:54:49 -07:00
Elliott Hughes
d149c9e59a aapt: expat exports its header files now.
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
(cherry picked from commit 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
2015-07-24 18:08:45 +00:00
Deepanshu Gupta
700ec4b42c am 825a6d12: am 3420d579: am 0e0d4ec9: am f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '825a6d12a8a5376cc3763aca5f4d32a388407c09':
  Set support flag for custom layouts for RecyclerView.
2015-07-24 04:06:38 +00:00
Deepanshu Gupta
328fd9c177 am 3983f586: am e45289f5: am f5ba5356: am 49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit '3983f5861d39599b67be32697902f59af097abfd':
  LayoutLib: translucent sys ui bars
  Move the layout code out of RenderSessionImpl.
2015-07-24 04:06:22 +00:00
Deepanshu Gupta
0a5bcf83f7 am 3ca27bd1: am 2df99f99: am 678aef41: am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '3ca27bd17b3b82db15856a60d6dcd5d6d36d74a8':
  CalendarView rendering: use R.styleable to find attr.
2015-07-24 04:06:15 +00:00
Ying Wang
82826fa884 am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '802da28f22f2869c810531b95ac90f7fa446df93':
  Add phony source target in the generated dependency file of aidl.
2015-07-24 01:11:06 +00:00
Ying Wang
430c8c3e48 Merge "Add phony source target in the generated dependency file of aidl." 2015-07-24 00:38:08 +00:00
Deepanshu Gupta
f199ac84f3 Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev 2015-07-23 23:47:10 +00:00
Deepanshu Gupta
f7712d3524 Set support flag for custom layouts for RecyclerView.
Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
2015-07-23 16:40:23 -07:00
Deepanshu Gupta
49fcfdd4ba Merge changes I9c294329,Ie4db5d28 into mnc-dev
* changes:
  LayoutLib: translucent sys ui bars
  Move the layout code out of RenderSessionImpl.
2015-07-23 23:02:57 +00:00
Deepanshu Gupta
f33c0f8516 Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev 2015-07-23 23:02:46 +00:00
Deepanshu Gupta
fc8f4aad73 LayoutLib: translucent sys ui bars
Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
2015-07-23 15:54:26 -07:00
Colin Cross
a083ef9a7b am bbcc914b: am 01efd7e8: Merge "Use build_number from file"
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
2015-07-23 19:11:22 +00:00
Deepanshu Gupta
b1484862e2 Move the layout code out of RenderSessionImpl.
Also, switch to using a RelativeLayout from a LinearLayout. The change
will help in future when enabling transparent status and nav bar.

Change-Id: Ie4db5d28313f1c5ef775603788598a56409f92c7
2015-07-23 11:59:16 -07:00
Deepanshu Gupta
e8018480db CalendarView rendering: use R.styleable to find attr.
Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.

Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
2015-07-23 11:59:09 -07:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Ying Wang
50fb02da53 Add phony source target in the generated dependency file of aidl.
This fixes make error when the source .aidl file is moved around but
its path relative to LOCAL_PATH doesn't change.

Bug: 22666539
Change-Id: Idf2492145e4927779d184932a09d61e4fe8ded0f
2015-07-22 17:49:56 -07:00
Elliott Hughes
1c6d9005d3 am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now."
* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.
2015-07-22 01:26:20 +00:00
Elliott Hughes
b48adad2ed aapt: expat exports its header files now.
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
2015-07-21 17:25:01 -07:00
Colin Cross
06e04f7671 Use build_number from file
Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71
2015-07-21 12:55:13 -07:00
Diego Perez
b9935889b1 resolved conflicts for merge of 112d8a36 to mnc-dev
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
2015-07-21 15:32:55 +01:00
Diego Perez
112d8a3641 am d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit 'd6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
  Render to measured size when using expand mode
2015-07-21 13:20:23 +00:00
Diego Perez
7720eb18c1 Merge "Render to measured size when using expand mode" into lmp-mr1-dev 2015-07-21 12:56:56 +00:00
Deepanshu Gupta
a6ad75fbe0 Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev 2015-07-16 00:59:36 +00:00
Deepanshu Gupta
4328626676 Merge "Change tools:list_item to listitem." into mnc-dev 2015-07-16 00:59:18 +00:00
Deepanshu Gupta
ccbc117703 Add tools:openDrawer to open a DrawerLayout.
Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.

Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
2015-07-15 16:38:25 -07:00
Deepanshu Gupta
111dc04a28 Change tools:list_item to listitem.
The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.

Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5
2015-07-15 16:31:00 -07:00
Dianne Hackborn
a503b62b15 Fix build.
Change-Id: Ib165c32d1d87e971902b4dd7300ccebd65e71a7d
2015-07-15 11:58:27 -07:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
2015-07-14 18:33:08 -07:00
Fyodor Kupolov
d4fd8c766d Added sendBroadcastMultiplePermissions method
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.

Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
2015-07-14 17:25:42 -07:00