3927 Commits

Author SHA1 Message Date
Adam Lesinski
f473084a4a am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
* commit '6df21b51b118281a46cfd3c13716718040a33aea':
  AAPT: Fix regression in resource versioning
2015-08-16 02:54:54 +00:00
Dan Albert
293b85ba82 Merge "Fix pessimizing move." into mnc-dev-plus-aosp 2015-08-15 03:17:43 +00:00
Adam Lesinski
9a9fd61e0b am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning
2015-08-14 20:51:21 +00:00
Dan Albert
68dd736156 Fix pessimizing move.
Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I80e98229359bdff5873be602d85ae6c502c67c1d
(cherry picked from commit 986d3f2eee7bbfbb588aa0e26f250d4016769ff2)
2015-08-14 20:43:03 +00:00
Dan Albert
ba98f7c595 Fix pessimizing move.
Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I80e98229359bdff5873be602d85ae6c502c67c1d
(cherry picked from commit 986d3f2eee7bbfbb588aa0e26f250d4016769ff2)
2015-08-14 20:42:35 +00:00
Adam Lesinski
beb9e33bfb AAPT: Fix regression in resource versioning
With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
2015-08-14 13:41:46 -07:00
Elliott Hughes
344d347af2 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 23:28:30 +00:00
Elliott Hughes
17b4be07fe am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 23:21:56 +00:00
Elliott Hughes
ba3fe56edc Lose HAVE_ANDROID_OS from frameworks/base.
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
2015-08-12 14:49:53 -07:00
Diego Perez
e56287edcd am 62db64f4: am 83ec22a8: am af8c19e7: am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev
* commit '62db64f4f3bf93ee25cc54b74f906e74db2dbf1c':
  Make DelegateManager thread safe
2015-08-11 21:11:34 +00:00
Diego Perez
0dcad221f1 am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev
* commit '7d85b5435d01f8d4856a718d655e30fb5a703560':
  Make DelegateManager thread safe
2015-08-11 20:51:03 +00:00
Diego Perez
7d85b5435d Merge "Make DelegateManager thread safe" into mnc-dev 2015-08-11 20:44:40 +00:00
Diego Perez
511e48728a Make DelegateManager thread safe
We have been seeing crashes on the Theme editor related to an assertion
on getDelegate when the object does not exist
(http://b.android.com/181951).
When debugging, the crash was happening without seeing a previous call
to removeJavaReference. This seems to completely remove that crash.
Since the DelegateManager can be called at least from two threads
(main thread and the finalizer), it should be thread safe.

Bug: http://b.android.com/181951
Change-Id: I1b28f863ff198f8592f170a98f9de391b2ac3ea2
2015-08-07 11:24:38 +01:00
Deepanshu Gupta
3a13380177 am c344ac57: am fbdf2032: am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
* commit 'c344ac576f79b5ba7940007b712fb79a220ab4b0':
  LayoutLib: Switch SimpleDateFormat to icu.
2015-08-07 00:01:24 +00:00
Deepanshu Gupta
7fe85fa70b am 63790291: am 2081769f: am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev
* commit '63790291a4c385d3e92680af816f4fe32d6535ef':
  Replace Locale.getDefault with custom impl.
2015-08-06 23:44:08 +00:00
Deepanshu Gupta
5cb02008f9 am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
* commit '8f26616d1a1765267d6a3ba09e7ac1bd6edeca67':
  LayoutLib: Switch SimpleDateFormat to icu.
2015-08-06 23:33:43 +00:00
Deepanshu Gupta
1cf52f6be9 am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev
* commit '385ce0a31dbdd4b4b1865755dbc4af157f72481c':
  Replace Locale.getDefault with custom impl.
2015-08-06 23:15:59 +00:00
Deepanshu Gupta
b556decf75 LayoutLib: Switch SimpleDateFormat to icu.
Use ICU's implementation of SimpleDateFormat in LayoutLib. The format
patterns used are not supported by java.text.SimpleDateFormat.

The change required adding a mechanism for promoting visibility of
fields in the framework in the create tool.
TODO: Add additional tests in the create tool for this new
functionality.

Change-Id: Id0f4be41f9731c42a28919c32cc5ef271a656982
2015-08-06 16:04:04 -07:00
Deepanshu Gupta
82c7fdb1f6 Replace Locale.getDefault with custom impl.
In LayoutLib the default locale should always be the locale set the
rendering params. This change replaces all calls to Locale.getDefault in
the framework with calls to AndroidLocale.getDefault() which tries to
find the locale from the current context, but falls back to the original
call.

Change-Id: I496b35dcfc17fd61fedee21c7495541ab870b1fc
2015-08-06 16:03:19 -07:00
Deepanshu Gupta
f22a58d1de am 0889fd29: am 0e0d254c: am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '0889fd295974ce589ccd0e7a44932012ede577db':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
2015-08-06 02:48:39 +00:00
Deepanshu Gupta
63cd28afc3 am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
2015-08-05 21:19:52 +00:00
Deepanshu Gupta
0437cac76c Make getInt in BridgeTypedArray accept empty String.
The XML editor already warns about the empty strings in places where an
int value is required. There's no need to show another warning for it in
the rendering panel. Also, the rendering might have also failed when the
empty string is encountered. Try an continue the rendering, because no
rendering state is really bad.

Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d
2015-08-04 11:57:10 -07:00
Deepanshu Gupta
a9090705ef Fix layout mirroring.
Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
2015-08-04 11:56:44 -07:00
Diego Perez
529be16e61 am daacad45: am 616ae85e: am 126973d4: am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit 'daacad45fd19d35b2b8f8bce9c4cd19d4f735200':
  Restore session params "no decoration" flag
2015-08-03 22:03:02 +00:00
Deepanshu Gupta
534d9485f2 am e92b2645: am 33bdfe75: am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit 'e92b2645b234a7e3555a26aacb964706509269df':
  Revert to using AppTheme for LayoutLib tests.
  Fix Matrix_Delegate.native_getValues()
  Update test image for upated nav icons.
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
  Fix bugs introduced in 78aa664.
2015-08-03 22:02:57 +00:00
Diego Perez
16a1c9e19b am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
  Restore session params "no decoration" flag
2015-08-03 21:40:47 +00:00
Deepanshu Gupta
fecb60f1a7 am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit 'd985e3b61990837711d1f26def51caa76b9be473':
  Revert to using AppTheme for LayoutLib tests.
  Fix Matrix_Delegate.native_getValues()
  Update test image for upated nav icons.
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
  Fix bugs introduced in 78aa664.
2015-08-03 21:34:35 +00:00
Diego Perez
405eceb20a Merge "Restore session params "no decoration" flag" into mnc-dev 2015-08-03 21:33:24 +00:00
Deepanshu Gupta
89a045c31f Revert to using AppTheme for LayoutLib tests.
Use AppTheme for all tests other than testExpand. AppTheme contains an
attribute needed by testArrayCheck. Also, since the AppTheme extends
Theme.Material.Light.DarkActionBar, other tests should be unaffected.

Also, update the golden image for the testArrayCheck.

Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
2015-08-03 11:42:33 -07:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 17:56:37 +00:00
Deepanshu Gupta
9f280a9301 Fix Matrix_Delegate.native_getValues()
The bug manifested itself by not rendering the wifi icon in the status
bar.

Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
2015-08-03 10:24:57 -07:00
Diego Perez
71a85575d4 Restore session params "no decoration" flag
This seems to have removed from a previous version and the theme editor
relies on it to remove the decoration around the preview.

Change-Id: Ifab99e9c1689bfe44ca593e8c66c24e57c3e8c4c
2015-08-03 14:20:18 +01:00
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
Yusuke Sato
c2369c5301 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-07-31 23:34:06 +00:00
Yusuke Sato
158560ad66 Merge "Distinguish user-requested shutdown from power-related ones" 2015-07-31 23:13:16 +00:00
Deepanshu Gupta
c2622d8923 Update test image for upated nav icons.
The image shows the nav icons to be separated by a significant distance.
This is because the switch to wide-screen layout happens based on
shortest width. The layout has a small shortest width and hence it uses
the phone layout for a horizontal nav bar and it doesn't look nice. Real
devices will never have this config, so it's okay.

Change-Id: Ic494ee7fdfb1116db39bcab6d6ee7a1e514b23df
2015-07-31 13:17:15 -07:00
Deepanshu Gupta
5a8f33f1b0 Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
2015-07-31 13:10:18 -07:00
Deepanshu Gupta
7b1e486e87 Fix bugs introduced in 78aa664.
Fix a couple of bugs (ArrayIndexOutOfBoundsException due to
miscalculation and a typo - swapped src and dst) introduced in the CL:
78aa664 Poor implementation of Path.approximate()

Change-Id: Iff7dbbf66d2714df51699ddb9a4169c38feefa7b
2015-07-31 13:00:05 -07:00
Dianne Hackborn
b1dc344166 am ebbc891a: Merge "Fix build." into mnc-dev
* commit 'ebbc891ae4ca835dea278430e3bad42d4630e2af':
  Fix build.
2015-07-31 18:26:19 +00:00
Dianne Hackborn
e5d926deb2 Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
2015-07-31 11:17:43 -07:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -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
10730b6907 am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit 'e3b0119f79d11744a7f590510b184feef0f45894':
  AAPT: Fix resource versioning
2015-07-31 00:35:12 +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
a1e1d1427f am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '7676e403bd65435eb3d2f34e7e0174fd37f6e818':
  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:06:02 +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
Elliott Hughes
e62867247d 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:15:45 +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