Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,471 Commits 3 Branches 0 Tags
56ee010cd84480ed719e620308091414377ecbce
Commit Graph

54134 Commits

Author SHA1 Message Date
Adam Powell
56ee010cd8 am 93af99f2: am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 
* commit '93af99f21d5499b3d2100951f9238a296043b355':
  Fix crash in ToolbarActionBar when setting null custom view
 2015-06-16 22:17:23 +00:00
Eino-Ville Talvala
0c330f24c7 am 70b68cda: am e652f928: am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit '70b68cdac4a5c7712cba60a7c3adec3becc485cf':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 22:05:05 +00:00
Rubin Xu
d2acb164dd am befbdb00: am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'befbdb00f9b3bd7edcbdd688754c9b782a4bb73c':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 22:04:48 +00:00
Chirag Shah
e7f39c51cf am 3db44d08: am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '3db44d08ea8fb083ec952ff647b6037bb9b2253d':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 22:04:11 +00:00
Adam Powell
93af99f21d am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 
* commit '749285a23873cd134788b3affae39643b1543653':
  Fix crash in ToolbarActionBar when setting null custom view
 2015-06-16 22:04:01 +00:00
Abodunrinwa Toki
bb6ccf9714 am a9eee504: am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit 'a9eee50455ff3894a17273fa1ffac2700cfa0d4c':
  Fix floating toolbar flickers.
 2015-06-16 22:03:52 +00:00
George Mount
335b173012 am b5f0e3bd: am 2a255904: am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 
* commit 'b5f0e3bdba93fbe61056c8f4b8c82e342f5da164':
  Have the final setVisibility cause a requestLayout.
 2015-06-16 22:03:46 +00:00
Benjamin Franz
4dfc61bfd6 am 3be79152: am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit '3be79152cf98b6033788d3e20c8f1dac7aefde35':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 22:03:33 +00:00
Abodunrinwa Toki
4165566936 am 686a2e63: am 7ebde83a: am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 
* commit '686a2e633c0cb9ab4a31333cd36c30fea9991776':
  Floating toolbar no longer obstructs the soft keyboard.
 2015-06-16 22:03:20 +00:00
Narayan Kamath
f01ffe05d2 am ba6e9b12: am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev 
* commit 'ba6e9b12a23657995b7761daf1b83366c652626e':
  Better systrace slices for application startup.
 2015-06-16 22:03:13 +00:00
Paul Jensen
4b0d61c504 am 79cd02c4: am 8235c839: am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '79cd02c4b0ada6eff5979f0cd39f3799606ba9bb':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-16 22:03:06 +00:00
Adam Powell
26b27cab81 Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 2015-06-16 21:29:48 +00:00
Eino-Ville Talvala
70b68cdac4 am e652f928: am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit 'e652f928ad22b00b36271caace29a0fdd17dd9a2':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 21:25:53 +00:00
Rubin Xu
befbdb00f9 am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'a4f1642ba16c13779d6a8ef187096259bcd1fd6f':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 21:25:28 +00:00
Chirag Shah
3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 21:24:48 +00:00
Abodunrinwa Toki
a9eee50455 am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit '03c70cac9a0d9dc7c9f2c71b28aaf609393fdcf3':
  Fix floating toolbar flickers.
 2015-06-16 21:24:34 +00:00
George Mount
b5f0e3bdba am 2a255904: am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 
* commit '2a25590428d3fa8e01f74f214b7c4c2d1c712afe':
  Have the final setVisibility cause a requestLayout.
 2015-06-16 21:24:30 +00:00
Benjamin Franz
3be79152cf am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit '84e38f687819e47ffe3bae1fd2588d0f22fafa90':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 21:24:20 +00:00
Abodunrinwa Toki
686a2e633c am 7ebde83a: am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 
* commit '7ebde83a479f6447e0862e814830374a8477665b':
  Floating toolbar no longer obstructs the soft keyboard.
 2015-06-16 21:24:10 +00:00
Narayan Kamath
ba6e9b12a2 am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev 
* commit '2d13fe56eec54030fe09cae74c7a92be54c8bd19':
  Better systrace slices for application startup.
 2015-06-16 21:24:04 +00:00
Paul Jensen
79cd02c4b0 am 8235c839: am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '8235c839aa9caaf6b36820007f928367bd829736':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-16 21:24:00 +00:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system. 
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
 2015-06-16 11:45:33 -07:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Abodunrinwa Toki
98f98dd19d Merge "Fix floating toolbar flickers." into mnc-dev 2015-06-16 15:54:26 +00:00
George Mount
209fb43376 Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 2015-06-16 15:27:27 +00:00
Abodunrinwa Toki
f444b5c3ae Fix floating toolbar flickers. 
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.

-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.

Bug: 21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
 2015-06-16 15:47:04 +01:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +00:00
Abodunrinwa Toki
6161c5b4cd Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 2015-06-16 12:29:55 +00:00
Narayan Kamath
275294dbce Merge "Better systrace slices for application startup." into mnc-dev 2015-06-16 11:50:57 +00:00
Paul Jensen
19769114b4 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-16 11:30:51 +00:00
Narayan Kamath
fbb32f6440 Better systrace slices for application startup. 
This change adds three new timeslices :

- PostFork : As soon as possible after the app forks from the
  zygote. Can be used in conjunction with the system_server
  "Start proc:" event to derive an upper bound on fork() and
  zygote overhead.

- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
  and ActivityThread#main.

ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.

Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.

bug: 21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
 2015-06-16 12:06:31 +01:00
Benjamin Franz
c6a9653e0a Update documentation for PASSWORD_QUALITY_SOMETHING 
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.

Bug: 20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
 2015-06-16 11:23:38 +01:00
Jeff Sharkey
1142341872 am 10d045cd: am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '10d045cd08a60403056f90f03b8f79dc0bf18571':
  Yet another user restriction.
 2015-06-16 05:44:15 +00:00
Jeff Sharkey
10d045cd08 am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '716978e36b30f339e615eee289a8cbc6f68a4df4':
  Yet another user restriction.
 2015-06-16 05:28:43 +00:00
Jeff Sharkey
ec9da72a7a am 835a40aa: am 7f39beb2: am a65a1582: Merge "Update file size formatting." into mnc-dev 
* commit '835a40aac0600b0ba0e2615a80ba000fedb585e2':
  Update file size formatting.
 2015-06-16 05:22:00 +00:00
Jeff Sharkey
835a40aac0 am 7f39beb2: am a65a1582: Merge "Update file size formatting." into mnc-dev 
* commit '7f39beb28e2f20c54529848cbee3429d17ae76ec':
  Update file size formatting.
 2015-06-16 05:10:51 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction. 
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
 2015-06-15 21:50:47 -07:00
Jeff Sharkey
a65a1582f5 Merge "Update file size formatting." into mnc-dev 2015-06-16 04:47:21 +00:00
Jeff Sharkey
b521feaed4 Update file size formatting. 
Per UX, default strings should have space between value and units
resulting in "12.3 GB".  Add a formatting variant that returns the
various components for callers who want to build their own strings.

For now there is only one mounted emulated volume at a time, and
it's always the primary storage, so give it the default rootId to
keep old Uris working.

Change-Id: Ifcc72a91a6b397ee65dc92642153286186eb64ac
 2015-06-15 21:39:28 -07:00
Erik Kline
3805777496 am 47585f46: am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 
* commit '47585f462a9cde661169b16cea870c05e91d92f8':
  Add a test that Network#getNetworkHandle() behaves sanely.
 2015-06-16 04:17:27 +00:00
Erik Kline
47585f462a am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 
* commit 'a01b9e6f43b2c5d6a083b34ae0c8140abb09806a':
  Add a test that Network#getNetworkHandle() behaves sanely.
 2015-06-16 04:05:03 +00:00
Erik Kline
0d16281a03 Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 2015-06-16 03:43:56 +00:00
Paul Jensen
434dde84ee Remove dead hidden ConnectivityManager and NetworkInfo APIs. 
- There are no callers of
  NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
  code that deals with mIsConnectedToProvisioningNetwork being true,
  including the two ConnectiviyManager APIs.
- There are no callers of
  ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
  the code that reads this URL.
- There are no callers of
  ConnectivityManager.captivePortalCheckCompleted(), so remove this
  API which is currently a no-op.

Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
 2015-06-16 02:07:36 +00:00
Ruben Brunk
86ff6ea3ff am 629923b5: am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '629923b56ece68048b9c3903d7bbfa90ec1493ec':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:43:32 +00:00
Ruben Brunk
629923b56e am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit 'e9a1f181ee35dd376803ea98214e1bdbdc9250ef':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:31:49 +00:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Adam Lesinski
fead72a3c8 am 73e99934: am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit '73e999341f15f1064563ea0c5a0eb0f99b6da19c':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 01:12:52 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions. 
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
 2015-06-15 18:09:33 -07:00
Adam Lesinski
73e999341f am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'f86b2096e5b5e2bae440da8b90d27bc17f8d24a5':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 01:01:01 +00:00