Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,850 Commits 3 Branches 0 Tags
6bef57cf0bbfa80fc85d2fd415dc0b805e4317fe
Commit Graph

234850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
6bef57cf0b Merge "Start with mHiddenForOtherReasons=true" into nyc-dev 
am: 58d3f97002

* commit '58d3f97002b67df8d31fa94b3319c159f93f85df':
  Start with mHiddenForOtherReasons=true
 2016-02-25 19:01:02 +00:00
Jeff Sharkey
da10f9f8dc Merge "Fix JobSchedulerService FBE regression." into nyc-dev 
am: 019f6d9caa

* commit '019f6d9caa7de3c3ebd42ca7fd1a229d74c86e7e':
  Fix JobSchedulerService FBE regression.
 2016-02-25 18:59:13 +00:00
Shishir Agrawal
674f4d7cee Merge "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into nyc-dev 
am: 70d5c8d246

* commit '70d5c8d246e63f279f8893954ac650b6a0b7f0ca':
  Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
 2016-02-25 18:56:39 +00:00
Adrian Roos
3528507dc3 Add logging to crash and anr dialog 
am: 9046222cb2

* commit '9046222cb2b1bd57278ddbf71d9f628f8dd254ae':
  Add logging to crash and anr dialog
 2016-02-25 18:52:40 +00:00
Jorim Jaggi
58d3f97002 Merge "Start with mHiddenForOtherReasons=true" into nyc-dev 2016-02-25 18:52:27 +00:00
Jeff Sharkey
019f6d9caa Merge "Fix JobSchedulerService FBE regression." into nyc-dev 2016-02-25 18:52:14 +00:00
Jorim Jaggi
1eb39b009e Start with mHiddenForOtherReasons=true 
Initially a surface is hidden after creating, so reflect that fact
in mHiddenForOtherReasons, so it doesn't get shown before the correct
transformation is applied.

Bug: 27350530
Change-Id: Idfe8723195dd1488894da066fafee1f2c2afc12d
 2016-02-25 13:50:22 -05:00
Jorim Jaggi
bf35cc1f49 Merge "Accessibility for split-screen divider" into nyc-dev 
am: d7dbe7c486

* commit 'd7dbe7c486c245884110ddf37e92b37cbea673a6':
  Accessibility for split-screen divider
 2016-02-25 18:50:04 +00:00
Shishir Agrawal
70d5c8d246 Merge "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into nyc-dev 2016-02-25 18:49:48 +00:00
Jae Seo
5d93925037 Merge "TIF: Define activity action to set up channel sources" into nyc-dev 
am: 12eb094232

* commit '12eb094232fbb04e3ae8101f7566214947da1c3c':
  TIF: Define activity action to set up channel sources
 2016-02-25 18:43:32 +00:00
Adrian Roos
9046222cb2 Add logging to crash and anr dialog 
Bug: 26760334
Change-Id: If81c7a6834e86f7390febef6767a07fa4caded4d
 2016-02-25 18:41:01 +00:00
Jorim Jaggi
d7dbe7c486 Merge "Accessibility for split-screen divider" into nyc-dev 2016-02-25 18:40:22 +00:00
Jae Seo
12eb094232 Merge "TIF: Define activity action to set up channel sources" into nyc-dev 2016-02-25 18:37:34 +00:00
Ben Kwa
cb26ee57a0 Merge changes from topic \'dragon-drop\' into nyc-dev 
am: 355d731ece

* commit '355d731ece99b461bedab9dfe6113ccd3beb332b':
  Clean up after a drop event.
  Enable dragon drop for touch.
 2016-02-25 18:37:19 +00:00
Wale Ogunwale
2e54381d1f Merge "Remove starting window whenever the acitvity is stopped" into nyc-dev 
am: a06c25534c

* commit 'a06c25534cbc8e48d7519171499cdd874483cde3':
  Remove starting window whenever the acitvity is stopped
 2016-02-25 18:35:01 +00:00
Ben Kwa
355d731ece Merge changes from topic 'dragon-drop' into nyc-dev 
* changes:
  Clean up after a drop event.
  Enable dragon drop for touch.
 2016-02-25 18:32:48 +00:00
Wale Ogunwale
a06c25534c Merge "Remove starting window whenever the acitvity is stopped" into nyc-dev 2016-02-25 18:29:39 +00:00
Jorim Jaggi
88afd020b6 Accessibility for split-screen divider 
- Add label
- Add actions

Bug: 27274494
Bug: 26894949
Change-Id: I041c44f793f1ec86ec27951cc8e87868148b527d
 2016-02-25 13:18:12 -05:00
Shishir Agrawal
3bf26b5605 Multi-SIM - Fixing inconsistent naming in CarrierConfigManager. 
All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7
 2016-02-25 10:15:54 -08:00
Wale Ogunwale
9017ec0b15 Remove starting window whenever the acitvity is stopped 
The main app window will never finish drawing at this point so there
is nothing to trigger the removal of the starting window.

Also, set ActivityRecord.mStartingWindowShown to true for some cases
where we were telling WM to show starting window but not setting the
flag that would later be used for clean-up.

Bug: 26659857
Change-Id: I7a8582521853f1f95b77d8b08f4dd0cf778f8cbf
 2016-02-25 10:15:38 -08:00
Sunny Goyal
645ffa05f0 Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev 
am: c1a3181d8d

* commit 'c1a3181d8db25e36b4303822e429b2839468e259':
  Fixing the parent check loop to allow RemoteViewsFrameLayout
 2016-02-25 18:14:15 +00:00
Sunny Goyal
c1a3181d8d Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev 2016-02-25 18:10:38 +00:00
Jeff Sharkey
822cbd130f Fix JobSchedulerService FBE regression. 
Internally isReadyToBeExecutedLocked() needs to check if the target
service is actually present and runnable.  For example, when an FBE
device is locked, we need to keep any encryption-unaware jobs
pending until the device is later unlocked.

Bug: 26279465
Change-Id: I53ff4a2243ebe8a199d0e8dcf87dc3f5b06a2686
 2016-02-25 11:09:57 -07:00
Chris Craik
623df47294 Merge "Cleanup vertex attrib management" into nyc-dev 
am: dc32185b92

* commit 'dc32185b924b422d06cfcc399a4b53b0301d78b5':
  Cleanup vertex attrib management
 2016-02-25 17:38:31 +00:00
Alan Viverette
60d3b019eb Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev 
am: 4d85985f80

* commit '4d85985f80c114456ec47d3cce75ac0b4c2bdb5a':
  Use correct index when obtaining unresolved attribute value
 2016-02-25 17:34:00 +00:00
Chris Craik
dc32185b92 Merge "Cleanup vertex attrib management" into nyc-dev 2016-02-25 17:31:47 +00:00
Alan Viverette
4d85985f80 Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev 2016-02-25 17:25:39 +00:00
Sunny Goyal
b880d167a6 Fixing the parent check loop to allow RemoteViewsFrameLayout 
Bug: 27328093
Change-Id: I0f6ae8e95f952d40589eafb912ba188d15d7624c
 2016-02-25 09:07:37 -08:00
Baligh Uddin
2f5ab773d1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: def0127265  -s ours

* commit 'def012726534b92050d40fbe6dadf6529d4559bf':
  Import translations. DO NOT MERGE
 2016-02-25 16:54:31 +00:00
Baligh Uddin
32c8c47641 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: c2d828faf7  -s ours

* commit 'c2d828faf73e3ddac17ef09b0510c3d739d00a4c':
  Import translations. DO NOT MERGE
 2016-02-25 16:53:22 +00:00
Baligh Uddin
2a13125ec0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 26de45de03  -s ours

* commit '26de45de03debec367a3273c4ebd8db3fcf747cf':
  Import translations. DO NOT MERGE
 2016-02-25 16:52:14 +00:00
Baligh Uddin
e05611f7a9 Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp 2016-02-25 16:49:27 +00:00
Baligh Uddin
6f09b15012 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: f52c52047c  -s ours

* commit 'f52c52047cb380e1fd3ccb9e4178eb9d7152bfc2':
  Import translations. DO NOT MERGE
 2016-02-25 16:47:52 +00:00
Baligh Uddin
03e447bfe4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: f52c52047c  -s ours

* commit 'f52c52047cb380e1fd3ccb9e4178eb9d7152bfc2':
  Import translations. DO NOT MERGE
 2016-02-25 16:47:29 +00:00
Baligh Uddin
a2a167890c Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp 2016-02-25 16:45:23 +00:00
Baligh Uddin
61aee763e1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 519bbac6b6  -s ours

* commit '519bbac6b6a04baeabc90958b656f72d6cafc13a':
  Import translations. DO NOT MERGE
 2016-02-25 16:44:20 +00:00
Baligh Uddin
1458c978f7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 519bbac6b6  -s ours

* commit '519bbac6b6a04baeabc90958b656f72d6cafc13a':
  Import translations. DO NOT MERGE
 2016-02-25 16:42:49 +00:00
Baligh Uddin
09e7821239 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 65fba84f0f  -s ours

* commit '65fba84f0f7d47bb921ee5e3e896b4444e05dba4':
  Import translations. DO NOT MERGE
 2016-02-25 16:39:53 +00:00
Baligh Uddin
9e52c3232f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 181ee474e1  -s ours

* commit '181ee474e19e67f89500fe36edd6f03966ea15de':
  Import translations. DO NOT MERGE
 2016-02-25 16:38:42 +00:00
Baligh Uddin
2cd3ba94a6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: f73b7b5cec  -s ours

* commit 'f73b7b5cec01af560088eafcd9402486fb293777':
  Import translations. DO NOT MERGE
 2016-02-25 16:37:04 +00:00
Adrian Roos
a66cd8a7be Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp 2016-02-25 16:35:23 +00:00
Adrian Roos
b474a3f402 Merge "Fix anti falsing detection" into nyc-dev 
am: 1c7c9d45b4

* commit '1c7c9d45b4f9dc3f599aeb98bb69a43cf307e9ef':
  Fix anti falsing detection
 2016-02-25 16:33:43 +00:00
Baligh Uddin
1b87093d76 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: cba593379f  -s ours

* commit 'cba593379f8106ddbbea3edf3b2ab70ee8f8ed94':
  Import translations. DO NOT MERGE
 2016-02-25 16:33:29 +00:00
Baligh Uddin
9ec467059f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: a3820eb541  -s ours

* commit 'a3820eb54106235ce8164927b685f30826b0b1e5':
  Import translations. DO NOT MERGE
 2016-02-25 16:31:46 +00:00
Baligh Uddin
00737e40d4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: ce60fbae7f  -s ours

* commit 'ce60fbae7f0798ce85103bc65bca3f52db738f21':
  Import translations. DO NOT MERGE
 2016-02-25 16:30:01 +00:00
Baligh Uddin
7fad32acdb Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 05be2f818b  -s ours

* commit '05be2f818b9bb6a1a98bac5c4beba4661395b82c':
  Import translations. DO NOT MERGE
 2016-02-25 16:28:47 +00:00
Baligh Uddin
b86cd39c9a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: c510d2a4ef  -s ours

* commit 'c510d2a4ef84532ce23af2096084430cbcd23866':
  Import translations. DO NOT MERGE
 2016-02-25 16:26:58 +00:00
Santos Cordon
8883d7eafb Merge "Add APIs to support CDMA add-call limitations." into nyc-dev 
am: 256aa5afd7

* commit '256aa5afd7329c5d784220bed99b2cb3904092b4':
  Add APIs to support CDMA add-call limitations.
 2016-02-25 16:24:02 +00:00
Adrian Roos
1c7c9d45b4 Merge "Fix anti falsing detection" into nyc-dev 2016-02-25 16:22:38 +00:00
Baligh Uddin
def0127265 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:21:53 +00:00